Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-common/src/main/java/com/ozs/common/enums/SysFileRefEnum.java

@@ -24,7 +24,7 @@ public enum SysFileRefEnum {
     PM_BID_WINNING_NOTIFICATION(13, "中标通知书"),
     PM_CONTRACT_INFO(14, "合同信息附件"),
     PM_PROJECT_CONSTRUCTION(15, "建设文档附件"),
-    PLAN_TEMPORARY_EXAMINE(16, "季度计划审核文件");
+    PLAN_TEMPORARY_EXAMINE(16, "临时、季度计划审核文件");
 
     private Integer type;
     private String info;

purchase-system/src/main/java/com/ozs/plan/mapper/ProvisionalPlanMapper.java

@@ -25,7 +25,7 @@ public interface ProvisionalPlanMapper extends BaseMapper<ProvisionalPlan> {
 
     List<ProvisionalPlan> selectProvisionalPlanAudit(ProvisionalPlanVo provisionalPlanVo);
 
-    int review(ProvisionalPlan provisionalPlan);
+    int review(ProvisionalPlanVo vo);
 
     /**
      * 通过年度ID，查询季度、临时计划详情

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

@@ -452,7 +452,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         demand.setCreateTime(new Date());
         pmDemandMapper.insert(demand);
         demandService.updateDemandWarnStatus(demand.getDemandId());
-        //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+        //计划附件也进行同步---查询季度计划附件后复制一份改为项目需求附件
         LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
         sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
         sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanPracticalId());
@@ -465,6 +465,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 sysFileRefMapper.insert(ref);
             }
         }
+        //上传审核文件并赋予计划审核通过
         vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         return review(vo);
     }
@@ -473,6 +474,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Transactional
     public AjaxResult reviewReturn(PlanQuarterStandardVo vo) {
         vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        //上传审核文件并赋予计划审核退回
         return review(vo);
     }
 

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

@@ -85,7 +85,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             // 删关联
             LambdaQueryWrapper<SysFileRef> lw = new LambdaQueryWrapper<>();
             lw.eq(SysFileRef::getRedId, provisionalPlan.getPlanPracticalId());
-            lw .eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
+            lw.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
             sysFileRefMapper.delete(lw);
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(provisionalPlan.getPlanPracticalId());
@@ -458,10 +458,10 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         pmDemandMapper.insert(demand);
         demandService.updateDemandWarnStatus(demand.getDemandId());
-        //计划附件也进行同步---查询年度计划附件后复制一份改为项目需求附件
+        //计划附件也进行同步---查询临时计划附件后复制一份改为项目需求附件
         LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
-        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
-        sysFileRefLp.eq(SysFileRef::getRedId, byId.getPlanYearId());
+        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_TEMPORARY.getType());
+        sysFileRefLp.eq(SysFileRef::getRedId, byId.getPlanPracticalId());
         List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
@@ -472,23 +472,23 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             }
         }
         byId.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(provisionalPlanVo, byId);
+        //上传审核文件并赋予计划审核通过
+        return review(provisionalPlanVo);
     }
 
     @Override
     public AjaxResult auditNoPass(ProvisionalPlanVo provisionalPlanVo) {
-        ProvisionalPlan provisionalPlan = new ProvisionalPlan();
-        BeanUtils.copyProperties(provisionalPlanVo, provisionalPlan);
-        provisionalPlan.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
-        return review(provisionalPlanVo, provisionalPlan);
+        provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        //上传审核文件并赋予计划审核退回
+        return review(provisionalPlanVo);
     }
 
-    private AjaxResult review(ProvisionalPlanVo vo, ProvisionalPlan provisionalPlan) {
+    private AjaxResult review(ProvisionalPlanVo vo) {
         List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
             for (SysFileRef ref : sysFileRefs) {
                 ref.setRedId(vo.getPlanPracticalId().longValue());
-                ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
                 ref.setCreateTime(new Date());
                 ref.setUpdated(vo.getUpdated());
@@ -496,7 +496,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 sysFileRefMapper.insert(ref);
             }
         }
-        int review = provisionalPlanMapper.review(provisionalPlan);
+        int review = provisionalPlanMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
         }

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

@@ -184,7 +184,7 @@
     </select>
 
     <!--	计划审核-->
-    <update id="review" parameterType="com.ozs.plan.doman.ProvisionalPlan">
+    <update id="review" parameterType="com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo">
         update plan_practical
         <trim prefix="SET" suffixOverrides=",">
             <if test="refuseReason != null and refuseReason != ''">