附件同步

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

@@ -438,63 +438,20 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 }
             }
         }
-        if (flay) {
-            realReviewTo(vo);
-        }
+        realReviewTo(vo, flay);
         return AjaxResult.success();
     }
 
-    public AjaxResult realReviewTo(PlanQuarterStandardVo vo) {
+    public AjaxResult realReviewTo(PlanQuarterStandardVo vo, boolean flay) {
         Date now = new Date();
         //季度计划审核通过后同步到年度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
-        PmDemand demand = new PmDemand();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         PlanYears ofYears = new PlanYears();
 
         BeanUtils.copyProperties(byId, ofYears);
         ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        planYearsMapper.insertPlanYears(ofYears);
-        quarters.setPlanYearId(ofYears.getPlanYearId());
-
-        BeanUtils.copyProperties(byId, demand);
-        demand.setEvaluation(byId.getEvaluation().doubleValue());
-        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-        demand.setPlanId(byId.getPlanPracticalId());
-        demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
-        //同步到项目管理状态为需求待填制
-        demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-        demand.setCreateTime(now);
-        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());
-        List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
-        if (!ObjectUtils.isEmpty(sysFileRefs)) {
-            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);
-            }
-            for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(ofYears.getPlanYearId());
-                ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
-                ref.setId(null);
-                ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(now);
-                ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(now);
-                sysFileRefMapper.insert(ref);
-            }
-        }
+
         //上传审核文件并赋予计划审核通过
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
@@ -506,31 +463,77 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 ref.setUpdated(vo.getUpdated());
                 ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
-                //同步到年度计划审核文件
-                SysFileRef ref1 = new SysFileRef(null, ofYears.getPlanYearId(), ref.getFileId(), SysFileRefEnum.PLAN_YEAR_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());
+        if (flay) {
+            planYearsMapper.insertPlanYears(ofYears);
+            quarters.setPlanYearId(ofYears.getPlanYearId());
+
+            PmDemand demand = new PmDemand();
+            BeanUtils.copyProperties(byId, demand);
+            demand.setEvaluation(byId.getEvaluation().doubleValue());
+            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
+            demand.setPlanId(byId.getPlanPracticalId());
+            demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
+            //同步到项目管理状态为需求待填制
+            demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
+            demand.setCreateTime(now);
+            pmDemandMapper.insert(demand);
+            demandService.updateDemandWarnStatus(demand.getDemandId());
+
+            //计划附件也进行同步---查询季度计划附件后同步到项目需求附件和年度计划附件
+            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+            sysFileRefLp.eq(SysFileRef::getRedId, vo.getPlanPracticalId());
+            sysFileRefLp.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_TEMPORARY.getType(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType()));
+            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+            if (!ObjectUtils.isEmpty(sysFileRefs)) {
+                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);
+                }
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(ofYears.getPlanYearId());
+                    ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                    ref.setId(null);
+                    ref.setCreated(vo.getUpdated());
+                    ref.setCreateTime(now);
+                    ref.setUpdated(vo.getUpdated());
+                    ref.setUpdateTime(now);
+                    sysFileRefMapper.insert(ref);
+                }
+            }
+
+            planQuarterMapper.updateById(quarters);
+            vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+
+        }
         return review(vo);
     }
 
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanQuarterStandardVo vo) {
+        Date now = new Date();
         vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
         //上传审核文件并赋予计划审核退回
+        List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefuses)) {
+            for (SysFileRef ref : sysFileRefuses) {
+                ref.setRedId(vo.getPlanPracticalId());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
+                ref.setCreated(vo.getUpdated());
+                ref.setCreateTime(now);
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(now);
+                sysFileRefMapper.insert(ref);
+            }
+        }
         return review(vo);
     }
 

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

@@ -410,13 +410,12 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                 }
             }
         }
-        if (flay) {
-            realReviewTo(provisionalPlanVo);
-        }
+        realReviewTo(provisionalPlanVo, flay);
         return AjaxResult.success();
     }
 
-    public AjaxResult realReviewTo(ProvisionalPlanVo provisionalPlanVo) {
+    public AjaxResult realReviewTo(ProvisionalPlanVo provisionalPlanVo, boolean flay) {
+        Date now = new Date();
         ProvisionalPlan byId = provisionalPlanMapper.seletById(provisionalPlanVo.getPlanPracticalId());
         if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
             PlanYears ofYears = new PlanYears();
@@ -425,62 +424,86 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
             planYearsMapper.insertPlanYears(ofYears);
             byId.setPlanYearId(ofYears.getPlanYearId());
         }
-        PmDemand demand = new PmDemand();
-        BeanUtils.copyProperties(byId, demand);
-        demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
-        demand.setEvaluation(byId.getEvaluation().doubleValue());
-        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-        //同步到项目管理状态为需求待填制
-        demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-        demand.setPurchaseDeptId(Long.parseLong(byId.getPurchaseDeptId()));
-        demand.setCreateTime(new Date());
-        demand.setCreateBy(provisionalPlanVo.getUpdated());
-        demand.setUpdateTime(demand.getCreateTime());
-        demand.setUpdateBy(demand.getCreateBy());
-        demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
-        pmDemandMapper.insert(demand);
-        demandService.updateDemandWarnStatus(demand.getDemandId());
-        //计划附件也进行同步---查询临时计划附件后复制一份改为项目需求附件
-        LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
-        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) {
-                ref.setRedId(demand.getDemandId());
-                ref.setType(SysFileRefEnum.PM_DEMAND.getType());
-                ref.setId(null);
-                sysFileRefMapper.insert(ref);
-            }
-        }
+
+
         //上传审核文件并赋予计划审核通过
-        provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
         List<SysFileRef> sysFileRefss = provisionalPlanVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefss)) {
             for (SysFileRef ref : sysFileRefss) {
                 ref.setRedId(provisionalPlanVo.getPlanPracticalId().longValue());
                 ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref.setCreated(provisionalPlanVo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(provisionalPlanVo.getUpdated());
-                ref.setUpdateTime(new Date());
+                ref.setUpdateTime(now);
                 sysFileRefMapper.insert(ref);
-                //同步到采购需求审核文件
-                SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND.getType());
-                ref2.setCreated(provisionalPlanVo.getUpdated());
-                ref2.setCreateTime(new Date());
-                ref2.setUpdated(provisionalPlanVo.getUpdated());
-                ref2.setUpdateTime(new Date());
-                sysFileRefMapper.insert(ref2);
             }
         }
+        if (flay) {
+            PmDemand demand = new PmDemand();
+            BeanUtils.copyProperties(byId, demand);
+            demand.setPlanId(Long.valueOf(byId.getPlanPracticalId()));
+            demand.setEvaluation(byId.getEvaluation().doubleValue());
+            demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
+            //同步到项目管理状态为需求待填制
+            demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
+            demand.setPurchaseDeptId(Long.parseLong(byId.getPurchaseDeptId()));
+            demand.setCreateTime(now);
+            demand.setCreateBy(provisionalPlanVo.getUpdated());
+            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());
+            //计划附件也进行同步---查询临时计划附件后复制一份改为项目需求附件
+            LambdaQueryWrapper<SysFileRef> sysFileRefLp = new LambdaQueryWrapper<>();
+            sysFileRefLp.eq(SysFileRef::getRedId, byId.getPlanPracticalId());
+            sysFileRefLp.in(SysFileRef::getType, Arrays.asList(SysFileRefEnum.PLAN_TEMPORARY.getType(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType()));
+            List<SysFileRef> sysFileRefs = sysFileRefMapper.selectList(sysFileRefLp);
+            if (!ObjectUtils.isEmpty(sysFileRefs)) {
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(demand.getDemandId());
+                    ref.setType(SysFileRefEnum.PM_DEMAND.getType());
+                    ref.setId(null);
+                    sysFileRefMapper.insert(ref);
+                }
+                for (SysFileRef ref : sysFileRefs) {
+                    ref.setRedId(byId.getPlanYearId());
+                    ref.setType(SysFileRefEnum.PLAN_YEAR.getType());
+                    ref.setId(null);
+                    ref.setCreated(provisionalPlanVo.getUpdated());
+                    ref.setCreateTime(now);
+                    ref.setUpdated(provisionalPlanVo.getUpdated());
+                    ref.setUpdateTime(now);
+                    sysFileRefMapper.insert(ref);
+                }
+            }
+
+        }
+
         return review(provisionalPlanVo);
     }
 
     @Override
     public AjaxResult auditNoPass(ProvisionalPlanVo provisionalPlanVo) {
+        Date now = new Date();
         provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
         //上传审核文件并赋予计划审核退回
+        List<SysFileRef> sysFileRefuses = provisionalPlanVo.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefuses)) {
+            for (SysFileRef ref : sysFileRefuses) {
+                ref.setRedId(provisionalPlanVo.getPlanPracticalId());
+                ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
+                ref.setCreated(provisionalPlanVo.getUpdated());
+                ref.setCreateTime(now);
+                ref.setUpdated(provisionalPlanVo.getUpdated());
+                ref.setUpdateTime(now);
+                sysFileRefMapper.insert(ref);
+            }
+        }
         return review(provisionalPlanVo);
     }