Merge remote-tracking branch 'origin/master'

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -27,6 +27,7 @@ import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
 import com.ozs.pm.service.PmAuditDeptRefService;
@@ -77,8 +78,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Autowired
     private ISysDictTypeService dictTypeService;
     @Autowired
-    private ISysDictDataService dictDataService;
-    @Autowired
     private ISysDeptService deptService;
     @Autowired
     SysFileRefMapper sysFileRefMapper;
@@ -94,6 +93,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     private ISysUserService userService;
     @Autowired
     private PmAuditDeptRefService pmAuditDeptRefService;
+    @Autowired
+    private PmAuditDeptRefMapper pmAuditDeptRefMapper;
 
     @Override
     public List<PlanQuarterResponseVo> selectPlanQuarterListEXP(PlanQuarterStandardVo vo, LoginUser loginUser) {
@@ -375,23 +376,39 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (!isBetweenValue(byId)) {
             return AjaxResult.error("所创计划不在提报日期内!");
         }
-        BigDecimal evaluation = byId.getEvaluation();
+        //申请修改之后再次提交，先清除上一次提交后的审核记录
+        PmAuditDeptRef ref = new PmAuditDeptRef();
+        ref.setRefId(byId.getPlanPracticalId()).setRefType("1").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
+        refIsExist(ref, pmAuditDeptRefMapper);
+        insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
+        int commit = planQuarterMapper.commit(quarterStandardVo.getPlanPracticalId());
+        if (commit != 1) {
+            return AjaxResult.error("项目状态数据异常");
+        }
+        return AjaxResult.success();
+    }
+
+    static void refIsExist(PmAuditDeptRef ref, PmAuditDeptRefMapper pmAuditDeptRefMapper) {
+        LambdaQueryWrapper<PmAuditDeptRef> lp = new LambdaQueryWrapper<>();
+        lp.eq(PmAuditDeptRef::getRefId, ref.getRefId());
+        lp.eq(PmAuditDeptRef::getRefType, ref.getRefType());
+        List<PmAuditDeptRef> refs = pmAuditDeptRefMapper.selectList(lp);
+        if (!ObjectUtils.isEmpty(refs)) {
+            pmAuditDeptRefMapper.delete(lp);
+        }
+    }
+
+    static void insertAuditDeptRef(ISysUserService userService, PmAuditDeptRefService pmAuditDeptRefService, PmAuditDeptRef ref) {
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
         Long deptId = sysUser.getDeptId();
-        if (!pmAuditDeptRefService.insertPmAuditDeptRefs(byId.getPlanPracticalId(),
-                "1",
+        if (!pmAuditDeptRefService.insertPmAuditDeptRefs(ref.getRefId(),
+                ref.getRefType(),
                 deptId,
-                evaluation,
+                ref.getEvaluation(),
                 sysUser.getUserId(),
-                byId.getProjectType())) {
+                ref.getProjectType())) {
             throw new ServiceException("审核关联数据插入失败");
         }
-
-        int commit = planQuarterMapper.commit(quarterStandardVo.getPlanPracticalId());
-        if (commit != 1) {
-            return AjaxResult.error("项目状态数据异常");
-        }
-        return AjaxResult.success();
     }
 
     @Override

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.base.domain.BaseAgency;
-import com.ozs.base.service.BaseAgencyService;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
@@ -32,6 +30,7 @@ import com.ozs.plan.service.PlanYearsService;
 import com.ozs.pm.doman.*;
 import com.ozs.pm.doman.vo.requestVo.PmDemandReqVo;
 import com.ozs.pm.doman.vo.responseVo.*;
+import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.*;
 import com.ozs.system.domain.SysFileInfo;
@@ -96,29 +95,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @Autowired
     private ProvisionalPlanMapper provisionalPlanMapper;
     @Autowired
-    private ISysDictDataService dictDataService;
-    @Autowired
-    private BaseAgencyService baseAgencyService;
-    @Autowired
-    private PmBookBuildingService pmBookBuildingService;
-    @Autowired
-    private PmReleaseAnnouncementService pmReleaseAnnouncementService;
-    @Autowired
-    private PmDemandExpertRefService pmDemandExpertRefService;
-    @Autowired
-    private PmBidOpeningService pmBidOpeningService;
-    @Autowired
-    private PmBidWinningService pmBidWinningService;
-    @Autowired
-    private PmBidFailureService pmBidFailureService;
-    @Autowired
-    private PmContractInfoService pmContractInfoService;
-    @Autowired
-    private PmProjectConstructionService pmProjectConstructionService;
-    @Autowired
     private SysFileRefService sysFileRefService;
     @Autowired
     private PmAuditDeptRefService pmAuditDeptRefService;
+    @Autowired
+    private PmAuditDeptRefMapper pmAuditDeptRefMapper;
 
     @Override
     public List<PlanYearsResponseVo> selectPlanYearsListEXP(PlanYearsStandardVo vo, LoginUser loginUser) {
@@ -435,22 +416,17 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         if (!isBetweenValue(byId)) {
             return AjaxResult.error("所创计划不在提报日期内!");
         }
-        BigDecimal evaluation = byId.getEvaluation();
-        SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-        Long deptId = sysUser.getDeptId();
-        if (!pmAuditDeptRefService.insertPmAuditDeptRefs(byId.getPlanYearId(),
-                "0",
-                deptId,
-                evaluation,
-                sysUser.getUserId(),
-                byId.getProjectType())) {
-            throw new ServiceException("审核关联数据插入失败");
-        }
+        //申请修改之后再次提交，先清除上一次提交后的审核记录
+        PmAuditDeptRef ref = new PmAuditDeptRef();
+        ref.setRefId(byId.getPlanYearId()).setRefType("0").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
+        PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
+        PlanQuarterServiceImpl.insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
 
         int commit = planYearsMapper.commit(yearsStandardVo.getPlanYearId());
         if (commit != 1) {
             return AjaxResult.error("项目状态数据异常");
         }
+
         return AjaxResult.success();
     }
 
@@ -1233,6 +1209,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 } else {
                     planYear.setAppDeleteDo("true");
                 }
+            } else {
+                planYear.setAppDeleteDo("true");
             }
 
             BeanUtils.copyProperties(planYear, responseVo);

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -29,6 +29,7 @@ import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.plan.service.ProvisionalPlanService;
 import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.doman.PmDemand;
+import com.ozs.pm.mapper.PmAuditDeptRefMapper;
 import com.ozs.pm.mapper.PmDemandMapper;
 import com.ozs.pm.service.IPmDemandService;
 import com.ozs.pm.service.PmAuditDeptRefService;
@@ -78,6 +79,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     @Autowired
     private PmAuditDeptRefService pmAuditDeptRefService;
     @Autowired
+    private PmAuditDeptRefMapper pmAuditDeptRefMapper;
+    @Autowired
     private PlanQuarterService quarterService;
 
     @Override
@@ -234,17 +237,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     @Transactional
     public int commitProvisionalPlan(ProvisionalPlanVo provisionalPlanVo) {
         ProvisionalPlan byId = provisionalPlanMapper.seletById(provisionalPlanVo.getPlanPracticalId());
-        BigDecimal evaluation = byId.getEvaluation();
-        SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-        Long deptId = sysUser.getDeptId();
-        if (!pmAuditDeptRefService.insertPmAuditDeptRefs(byId.getPlanPracticalId(),
-                "1",
-                deptId,
-                evaluation,
-                sysUser.getUserId(),
-                byId.getProjectType())) {
-            throw new ServiceException("审核关联数据插入失败");
-        }
+        //申请修改之后再次提交，先清除上一次提交后的审核记录
+        PmAuditDeptRef ref = new PmAuditDeptRef();
+        ref.setRefId(byId.getPlanPracticalId()).setRefType("1").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
+        PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
+        PlanQuarterServiceImpl.insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
         return provisionalPlanMapper.commitProvisionalPlan(provisionalPlanVo.getPlanPracticalId());
     }
 

purchase-system/src/main/java/com/ozs/pm/doman/PmAuditDeptRef.java

@@ -1,5 +1,6 @@
 package com.ozs.pm.doman;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -86,6 +87,12 @@ public class PmAuditDeptRef implements Serializable {
     @TableField("UPDATE_TIME")
     private Date updateTime;
 
+    @TableField(exist = false)
+    private BigDecimal evaluation;
+
+    @TableField(exist = false)
+    private String projectType;
+
     public PmAuditDeptRef() {
     }
 

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -150,6 +150,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Autowired
     private ISysDictDataService dictDataService;
     @Autowired
+    private ISysDictTypeService dictTypeService;
+    @Autowired
     private SysFileService fileService;
     @Autowired
     private SysFileRefService sysFileRefService;
@@ -3667,6 +3669,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     //字段转换and赋值
     public List<PmDemandResVo> demandChangeTo(List<PmDemand> pmDemandList) {
         List<PmDemandResVo> pmDemandResponseVoList = new ArrayList<>();
+        //获取字典数据
+        HashMap<String, HashMap<String, String>> planEnums = dictTypeService.getAboutEnums();
+        //项目属性
+        HashMap<String, String> projectAttributes = planEnums.get("projectAttributes");
         for (PmDemand pmDemand1 : pmDemandList) {
             PmDemandResVo vo = new PmDemandResVo();
             BeanUtils.copyProperties(pmDemand1, vo);
@@ -3679,7 +3685,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     }
                 }
             }
-
             String purchaseServicesName = dictDataService.selectDictLabel("purchase_services", vo.getPurchaseServices());
             if (StringUtils.isNotEmpty(purchaseServicesName)) {
                 vo.setPurchaseServicesName(purchaseServicesName);
@@ -3707,11 +3712,31 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     break;
                 }
             }
-            //项目属性
-            for (ProjectAttribute value : ProjectAttribute.values()) {
-                if (vo.getProjectAttr() != null && vo.getProjectAttr().equals(value.getCode())) {
-                    vo.setProjectAttrName(value.getInfo());
-                    break;
+            //项目属性为value拼接
+            if (!ObjectUtils.isEmpty(vo.getProjectAttr())) {
+                if (vo.getProjectAttr().length() > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    String[] split = vo.getProjectAttr().split(",");
+                    for (String s : split) {
+                        for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                            if (s.equals(entry.getValue())) {
+                                if (!vo.getProjectAttr().endsWith(s)) {
+                                    builder.append(entry.getKey() + ",");
+                                } else {
+                                    builder.append(entry.getKey());
+                                }
+                                break;
+                            }
+                        }
+                    }
+                    vo.setProjectAttrName(builder.toString());
+                } else {
+                    for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
+                        if (vo.getProjectAttr().equals(entry.getValue())) {
+                            vo.setProjectAttrName(entry.getKey());
+                            break;
+                        }
+                    }
                 }
             }
             //预警状态

purchase-system/src/main/resources/mapper/plan/PlanYearsMapper.xml

@@ -180,6 +180,9 @@
 			<if test="adjustReason != null and adjustReason != ''">
 				adjust_reason=#{adjustReason}
 			</if>
+			<if test="projectType != null and projectType != ''">
+				project_type= #{projectType}
+			</if>
 		</set>
 		where plan_year_id = #{planYearId}
 	</update>