buzhanyi пре 2 година
родитељ
комит
e9fcdcecfc

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

@@ -445,15 +445,18 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     }
 
     public AjaxResult realReviewTo(PlanQuarterStandardVo vo) {
+        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()));
@@ -461,10 +464,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
         //同步到项目管理状态为需求待填制
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
-        demand.setCreateTime(new Date());
+        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());
@@ -474,6 +478,20 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 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);
             }
         }
@@ -484,23 +502,23 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 ref.setRedId(vo.getPlanPracticalId());
                 ref.setType(SysFileRefEnum.PLAN_TEMPORARY_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
+                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(new Date());
+                ref1.setCreateTime(now);
                 ref1.setUpdated(vo.getUpdated());
-                ref1.setUpdateTime(new Date());
+                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(new Date());
+                ref2.setCreateTime(now);
                 ref2.setUpdated(vo.getUpdated());
-                ref2.setUpdateTime(new Date());
+                ref2.setUpdateTime(now);
                 sysFileRefMapper.insert(ref2);
             }
         }

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

@@ -507,6 +507,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Transactional
     public AjaxResult realReviewTo(PlanYearsStandardVo vo) {
+        Date now = new Date();
         //年度计划审核通过后同步到季度计划和项目管理
         PlanQuarter quarters = new PlanQuarter();
         PmDemand demand = new PmDemand();
@@ -517,7 +518,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         quarters.setPlanType(0);
         quarters.setPlanYearId(byId.getPlanYearId());
         quarters.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
-        quarters.setCreateTime(new Date());
+        quarters.setCreateTime(now);
         planQuarterMapper.insertPlanQuarter(quarters);
         //同步到项目管理状态为需求待填制
         demand.setPlanId(quarters.getPlanPracticalId());
@@ -525,7 +526,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         demand.setIsExcess(Integer.parseInt(byId.getIsExcess()));
         demand.setProjectStatus(PmProjectStatus.DEMAND_WAIT_FILL.getCode());
         demand.setPurchaseDeptId(Long.valueOf(byId.getPurchaseDeptId()));
-        demand.setCreateTime(new Date());
+        demand.setCreateTime(now);
         pmDemandMapper.insert(demand);
         log.info("预警状态更新:demandID:{}", demand.getDemandId());
         demandService.updateDemandWarnStatus(demand.getDemandId());
@@ -554,23 +555,23 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 ref.setRedId(vo.getPlanYearId());
                 ref.setType(SysFileRefEnum.PLAN_YEAR_EXAMINE.getType());
                 ref.setCreated(vo.getUpdated());
-                ref.setCreateTime(new Date());
+                ref.setCreateTime(now);
                 ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(new Date());
+                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(new Date());
+                ref1.setCreateTime(now);
                 ref1.setUpdated(vo.getUpdated());
-                ref1.setUpdateTime(new Date());
+                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(new Date());
+                ref2.setCreateTime(now);
                 ref2.setUpdated(vo.getUpdated());
-                ref2.setUpdateTime(new Date());
+                ref2.setUpdateTime(now);
                 sysFileRefMapper.insert(ref2);
             }
         }