处理附件同步

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

@@ -437,13 +437,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         PlanQuarter quarters = new PlanQuarter();
         PmDemand demand = new PmDemand();
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
-        if (ObjectUtils.isEmpty(byId.getPlanYearId())) {
-            PlanYears ofYears = new PlanYears();
-            BeanUtils.copyProperties(byId, ofYears);
-            ofYears.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-            planYearsMapper.insertPlanYears(ofYears);
-            quarters.setPlanYearId(ofYears.getPlanYearId());
-        }
+        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()));
@@ -469,6 +467,32 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         }
         //上传审核文件并赋予计划审核通过
         vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.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(new Date());
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref);
+                //同步到年度计划审核文件
+                SysFileRef ref1 = new SysFileRef(null, ofYears.getPlanYearId(), ref.getFileId(), SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+                ref1.setCreated(vo.getUpdated());
+                ref1.setCreateTime(new Date());
+                ref1.setUpdated(vo.getUpdated());
+                ref1.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref1);
+                //同步到采购需求审核文件
+                SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND_EXAMINE.getType());
+                ref2.setCreated(vo.getUpdated());
+                ref2.setCreateTime(new Date());
+                ref2.setUpdated(vo.getUpdated());
+                ref2.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref2);
+            }
+        }
         return review(vo);
     }
 
@@ -481,18 +505,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     private AjaxResult review(PlanQuarterStandardVo vo) {
-        List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
-        if (!ObjectUtils.isEmpty(sysFileRefs)) {
-            for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(vo.getPlanPracticalId());
-                ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
-                ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
-                ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
-                sysFileRefMapper.insert(ref);
-            }
-        }
         int review = planQuarterMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");

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

@@ -474,46 +474,67 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         BeanUtils.copyProperties(byId, quarters);
         BeanUtils.copyProperties(byId, demand);
 
-        //同步到季度计划状态为已审核---(已审核过的不再同步)
-        PlanQuarter quarter = planQuarterMapper.getByPlanYearId(vo.getPlanYearId());
-        if (ObjectUtils.isEmpty(quarter)) {
-            quarters.setPlanType(0);
-            quarters.setPlanYearId(byId.getPlanYearId());
-            quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-            quarters.setCreateTime(new Date());
-            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(new Date());
-            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);
-                }
+        quarters.setPlanType(0);
+        quarters.setPlanYearId(byId.getPlanYearId());
+        quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        quarters.setCreateTime(new Date());
+        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(new Date());
+        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);
             }
         }
-
         vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
+        List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
+        if (!ObjectUtils.isEmpty(sysFileRefuses)) {
+            for (SysFileRef ref : sysFileRefuses) {
+                ref.setRedId(vo.getPlanYearId());
+                ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
+                ref.setCreated(vo.getUpdated());
+                ref.setCreateTime(new Date());
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref);
+                //同步到临时、季度计划审核文件
+                SysFileRef ref1 = new SysFileRef(null, quarters.getPlanPracticalId(), ref.getFileId(), SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
+                ref1.setCreated(vo.getUpdated());
+                ref1.setCreateTime(new Date());
+                ref1.setUpdated(vo.getUpdated());
+                ref1.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref1);
+                //同步到采购需求审核文件
+                SysFileRef ref2 = new SysFileRef(null, demand.getDemandId(), ref.getFileId(), SysFileRefEnum.PM_DEMAND_EXAMINE.getType());
+                ref2.setCreated(vo.getUpdated());
+                ref2.setCreateTime(new Date());
+                ref2.setUpdated(vo.getUpdated());
+                ref2.setUpdateTime(new Date());
+                sysFileRefMapper.insert(ref2);
+            }
+        }
         return review(vo);
     }
 
@@ -525,18 +546,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     }
 
     private AjaxResult review(PlanYearsStandardVo vo) {
-        List<SysFileRef> sysFileRefs = vo.getSysFileRefs();
-        if (!ObjectUtils.isEmpty(sysFileRefs)) {
-            for (SysFileRef ref : sysFileRefs) {
-                ref.setRedId(vo.getPlanYearId());
-                ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
-                ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
-                ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
-                sysFileRefMapper.insert(ref);
-            }
-        }
         int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");
@@ -1082,7 +1091,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             } else if ("4".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
-                List<SysFileInfo> fileInfosAll =  new ArrayList<>();
+                List<SysFileInfo> fileInfosAll = new ArrayList<>();
                 //代理商信息
                 BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
                 pmPurchaseExecutionResVo.setBaseAgency(baseAgency);