|
@@ -8,10 +8,10 @@ import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.system.domain.ProposalInfo;
|
|
|
import com.ruoyi.system.domain.ProposalUnitReply;
|
|
|
+import com.ruoyi.system.domain.sqmy.SqmyInfo;
|
|
|
+import com.ruoyi.system.domain.sqmy.SqmyUnitReply;
|
|
|
import com.ruoyi.system.domain.urge.ZxUrge;
|
|
|
-import com.ruoyi.system.mapper.ProposalInfoMapper;
|
|
|
-import com.ruoyi.system.mapper.ProposalUnitReplyMapper;
|
|
|
-import com.ruoyi.system.mapper.ZxUrgeMapper;
|
|
|
+import com.ruoyi.system.mapper.*;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.ruoyi.system.service.IZxUrgeService;
|
|
@@ -31,6 +31,10 @@ public class ZxUrgeServiceImpl implements IZxUrgeService
|
|
|
private ProposalInfoMapper proposalInfoMapper;
|
|
|
@Autowired
|
|
|
private ProposalUnitReplyMapper proposalUnitReplyMapper;
|
|
|
+ @Autowired
|
|
|
+ private SqmyInfoMapper sqmyInfoMapper;
|
|
|
+ @Autowired
|
|
|
+ private SqmyUnitReplyMapper sqmyUnitReplyMapper;
|
|
|
|
|
|
/**
|
|
|
* 查询政协催办
|
|
@@ -86,7 +90,23 @@ public class ZxUrgeServiceImpl implements IZxUrgeService
|
|
|
zxUrge.setIssuer(user.getNickName());
|
|
|
zxUrge.setIssuerDeptId(user.getDeptId());
|
|
|
}else{
|
|
|
-
|
|
|
+ //民意
|
|
|
+ SqmyInfo sqmyInfo = sqmyInfoMapper.selectSqmyInfoBySqmyId(zxUrge.getScoreId());
|
|
|
+ //查询主办单位
|
|
|
+ SqmyUnitReply sqmyUnitReply = new SqmyUnitReply();
|
|
|
+ sqmyUnitReply.setSqmyId(zxUrge.getScoreId());
|
|
|
+ sqmyUnitReply.setType("2");
|
|
|
+ List<SqmyUnitReply> sqmyUnitReplys = sqmyUnitReplyMapper.selectSqmyUnitReplyList(sqmyUnitReply);
|
|
|
+ if(sqmyUnitReplys!=null && sqmyUnitReplys.size()>0){
|
|
|
+ zxUrge.setAcceptDeptId(sqmyUnitReplys.get(0).getDeptId());
|
|
|
+ zxUrge.setAcceptDept(sqmyUnitReplys.get(0).getDeptName());
|
|
|
+ }else {
|
|
|
+ throw new ServiceException("当前提案未分配主办单位,催办失败!");
|
|
|
+ }
|
|
|
+ zxUrge.setUrgeTitle(sqmyInfo.getTitle()+"的催办");
|
|
|
+ zxUrge.setIssuerId(user.getUserId());
|
|
|
+ zxUrge.setIssuer(user.getNickName());
|
|
|
+ zxUrge.setIssuerDeptId(user.getDeptId());
|
|
|
}
|
|
|
zxUrge.setUrgeTime(DateUtils.getNowDate());
|
|
|
zxUrge.setCreateTime(DateUtils.getNowDate());
|