年度计划附件

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

@@ -448,10 +448,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         PlanQuarter quarters = new PlanQuarter();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         PlanYears ofYears = new PlanYears();
-
         BeanUtils.copyProperties(byId, ofYears);
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-
         //上传审核文件并赋予计划审核通过
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
@@ -468,7 +466,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         if (flay) {
             planYearsMapper.insertPlanYears(ofYears);
             quarters.setPlanYearId(ofYears.getPlanYearId());
-
+            //同步到项目管理
             PmDemand demand = new PmDemand();
             BeanUtils.copyProperties(byId, demand);
             demand.setEvaluation(byId.getEvaluation().doubleValue());
@@ -480,7 +478,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             demand.setCreateTime(now);
             pmDemandMapper.insert(demand);
             demandService.updateDemandWarnStatus(demand.getDemandId());
-
             //计划附件也进行同步---查询季度计划附件后同步到项目需求附件和年度计划附件
             LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
             sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanPracticalId());
@@ -510,6 +507,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             }
 
             planQuarterMapper.updateById(quarters);
+            //赋予项目状态已审核
             vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             return review(vo);
         }

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

@@ -491,14 +491,12 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             }
         }
-        if (flay) {
-            realReviewTo(vo);
-        }
+        realReviewTo(vo, flay);
         return AjaxResult.success();
     }
 
     @Transactional
-    public AjaxResult realReviewTo(PlanYearsStandardVo vo) {
+    public AjaxResult realReviewTo(PlanYearsStandardVo vo, boolean flay) {
         Date now = new Date();
         //年度计划审核通过后同步到季度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
@@ -506,41 +504,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
         BeanUtils.copyProperties(byId, quarters);
         BeanUtils.copyProperties(byId, demand);
-
         quarters.setPlanType(0);
-        quarters.setPlanYearId(byId.getPlanYearId());
-        quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        quarters.setCreateTime(now);
-        planQuarterMapper.insertPlanQuarter(quarters);
-        //同步到项目管理状态为需求待填制
-        demand.setPlanId(quarters.getPlanPracticalId());
-        demand.setEvaluation(byId.getEvaluation().doubleValue());
-        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-        demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-        demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
-        demand.setCreateTime(now);
-        pmDemandMapper.insert(demand);
-        log.info("预警状态更新：demandID：{}", demand.getDemandId());
-        demandService.updateDemandWarnStatus(demand.getDemandId());
-        //计划附件进行同步---查询年度计划附件后分别添加项目需求附件和季度附件
-        LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
-        sysFileRefLp.eq(SysFileRef::getType, SysFileRefEnum.PLAN_YEAR.getType());
-        sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
-        List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
-        if (!ObjectUtils.isEmpty(sysFileRefs)) {
-            for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(quarters.getPlanPracticalId());
-                ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
-                ref.setId(null);
-                sysFileRefMapper.insert(ref);
-            }
-            for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(demand.getDemandId());
-                ref.setType(SysFileRefEnum.PM_DEMAND.getType());
-                ref.setId(null);
-                sysFileRefMapper.insert(ref);
-            }
-        }
+        //上传审核文件
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
             for (SysFileRef ref : sysFileRefuses) {
@@ -551,30 +516,74 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 ref.setUpdated(vo.getUpdated());
                 ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
-                //同步到临时、季度计划审核文件
-                SysFileRef ref1 = new SysFileRef(null, quarters.getPlanPracticalId(), ref.getFileId(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
-                ref1.setCreated(vo.getUpdated());
-                ref1.setCreateTime(now);
-                ref1.setUpdated(vo.getUpdated());
-                ref1.setUpdateTime(now);
-                sysFileRefMapper.insert(ref1);
-                //同步到采购需求审核文件
-                SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND.getType());
-                ref2.setCreated(vo.getUpdated());
-                ref2.setCreateTime(now);
-                ref2.setUpdated(vo.getUpdated());
-                ref2.setUpdateTime(now);
-                sysFileRefMapper.insert(ref2);
             }
         }
-        vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        return review(vo);
+        if (flay) {
+            //同步季度计划
+            quarters.setPlanYearId(byId.getPlanYearId());
+            quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+            quarters.setCreateTime(now);
+            planQuarterMapper.insertPlanQuarter(quarters);
+            //同步到项目管理状态为需求待填制
+            demand.setPlanId(quarters.getPlanPracticalId());
+            demand.setEvaluation(byId.getEvaluation().doubleValue());
+            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
+            demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
+            demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
+            demand.setCreateTime(now);
+            pmDemandMapper.insert(demand);
+            log.info("预警状态更新：demandID：{}", demand.getDemandId());
+            demandService.updateDemandWarnStatus(demand.getDemandId());
+            //计划附件进行同步---查询年度计划附件后分别添加项目需求附件和季度附件
+            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+            sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanYearId());
+            sysFileRefLp.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_YEAR.getType(), SysFileRefEnum.PLAN_YEAR_EXAMINE.getType()));
+            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+            if (!ObjectUtils.isEmpty(sysFileRefs)) {
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(quarters.getPlanPracticalId());
+                    ref.setType(SysFileRefEnum.PLAN_TEMPORARY.getType());
+                    ref.setId(null);
+                    ref.setCreated(vo.getUpdated());
+                    ref.setCreateTime(now);
+                    ref.setUpdated(vo.getUpdated());
+                    ref.setUpdateTime(now);
+                    sysFileRefMapper.insert(ref);
+                }
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(demand.getDemandId());
+                    ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                    ref.setId(null);
+                    ref.setCreated(vo.getUpdated());
+                    ref.setCreateTime(now);
+                    ref.setUpdated(vo.getUpdated());
+                    ref.setUpdateTime(now);
+                    sysFileRefMapper.insert(ref);
+                }
+            }
+            //赋予项目状态已审核
+            vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+            return review(vo);
+        }
+        return AjaxResult.success("成功");
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanYearsStandardVo vo) {
+        Date now = new Date();
         vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        //上传审核文件并赋予计划审核退回
+        List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
+        for (SysFileRef ref : sysFileRefuses) {
+            ref.setRedId(vo.getPlanYearId());
+            ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+            ref.setCreated(vo.getUpdated());
+            ref.setCreateTime(now);
+            ref.setUpdated(vo.getUpdated());
+            ref.setUpdateTime(now);
+            sysFileRefMapper.insert(ref);
+        }
         return review(vo);
     }
 
@@ -627,6 +636,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     /**
      * 需求单位--首页--计划管理总数
+     *
      * @return
      */
     @Override
@@ -697,6 +707,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     /**
      * 需求单位--首页--需求管理总数
+     *
      * @return
      */
     @Override

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

@@ -425,8 +425,7 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             byId.setPlanYearId(ofYears.getPlanYearId());
         }
 
-
-        //上传审核文件并赋予计划审核通过
+        //上传审核文件
         List<SysFileRef> sysFileRefss = provisionalPlanVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefss)) {
             for (SysFileRef ref : sysFileRefss) {
@@ -453,9 +452,6 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             demand.setUpdateTime(demand.getCreateTime());
             demand.setUpdateBy(demand.getCreateBy());
             demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-
-            provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-            provisionalPlanMapper.updateById(byId);
             pmDemandMapper.insert(demand);
             demandService.updateDemandWarnStatus(demand.getDemandId());
             //计划附件也进行同步---查询临时计划附件后复制一份改为项目需求附件
@@ -481,6 +477,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     sysFileRefMapper.insert(ref);
                 }
             }
+            provisionalPlanMapper.updateById(byId);
+            //赋予项目状态已审核
+            provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
             return review(provisionalPlanVo);
         }
         return AjaxResult.success("成功");