新需求变更

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanQuarterStandardVo.java

@@ -155,7 +155,7 @@ public class PlanQuarterStandardVo extends PageVo {
     /**
      * 上传附件
      */
-    List<SysFileRef> sysFileRefs;
+    private List<SysFileRef> sysFileRefs;
 
     /**
      * 查询参数开始时间和结束时间

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

@@ -105,6 +105,13 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
      */
     public AjaxResult reviewReturn(PlanQuarterStandardVo quarterStandardVo);
 
+    /**
+     * 上传审核文件
+     *
+     * @param vo
+     */
+    public void upExamineFile(PlanQuarterStandardVo vo);
+
     /**
      * 申请修改季度计划
      *

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

@@ -438,18 +438,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         //季度计划审核通过后同步到年度计划和项目管理
         PlanQuarter byId = planQuarterMapper.getById(vo.getPlanPracticalId());
         //上传审核文件并赋予计划审核通过
-        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);
-            }
-        }
+        upExamineFile(vo);
         if (flay) {
             //同步到项目管理
             PmDemand demand = new PmDemand();
@@ -490,9 +479,21 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
     @Override
     @Transactional
     public AjaxResult reviewReturn(PlanQuarterStandardVo vo) {
-        Date now = new Date();
         vo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
         //上传审核文件并赋予计划审核退回
+        upExamineFile(vo);
+        return review(vo);
+    }
+
+    /**
+     * 上传审核文件
+     *
+     * @param vo
+     */
+    @Override
+    @Transactional
+    public void upExamineFile(PlanQuarterStandardVo vo) {
+        Date now = new Date();
         List<SysFileRef> sysFileRefuses = vo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefuses)) {
             for (SysFileRef ref : sysFileRefuses) {
@@ -505,7 +506,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                 sysFileRefMapper.insert(ref);
             }
         }
-        return review(vo);
     }
 
     private AjaxResult review(PlanQuarterStandardVo vo) {

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

@@ -487,22 +487,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
 
     @Transactional
     public AjaxResult realReviewTo(PlanYearsStandardVo vo, boolean flay) {
-        Date now = new Date();
-        //年度计划审核通过后同步到项目管理
-        PlanYears byId = planYearsMapper.getById(vo.getPlanYearId());
-        //上传审核文件
-        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(now);
-                ref.setUpdated(vo.getUpdated());
-                ref.setUpdateTime(now);
-                sysFileRefMapper.insert(ref);
-            }
-        }
         if (flay) {
             //赋予项目状态已审核
             vo.setProjectStatus(ProjectStatus.PLANTOEXAMINE.getCode());
@@ -514,23 +498,25 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
     @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);
     }
 
     private AjaxResult review(PlanYearsStandardVo vo) {
+        Date now = new Date();
+        //上传审核文件
+        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(now);
+                ref.setUpdated(vo.getUpdated());
+                ref.setUpdateTime(now);
+                sysFileRefMapper.insert(ref);
+            }
+        }
         int review = planYearsMapper.review(vo);
         if (review != 1) {
             return AjaxResult.error("项目状态数据异常");

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

@@ -1,13 +1,9 @@
 package com.ozs.plan.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
-import com.ozs.base.domain.BasePolicy;
-import com.ozs.common.constant.Constants;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUser;
@@ -23,9 +19,11 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.plan.doman.PlanYears;
 import com.ozs.plan.doman.ProvisionalPlan;
+import com.ozs.plan.doman.vo.requestVo.PlanQuarterStandardVo;
 import com.ozs.plan.doman.vo.requestVo.ProvisionalPlanVo;
 import com.ozs.plan.mapper.PlanYearsMapper;
 import com.ozs.plan.mapper.ProvisionalPlanMapper;
+import com.ozs.plan.service.PlanQuarterService;
 import com.ozs.plan.service.ProvisionalPlanService;
 import com.ozs.pm.doman.PmAuditDeptRef;
 import com.ozs.pm.doman.PmDemand;
@@ -77,6 +75,8 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
     private ISysUserService userService;
     @Autowired
     private PmAuditDeptRefService pmAuditDeptRefService;
+    @Autowired
+    private PlanQuarterService quarterService;
 
     @Override
     public int deleteProvisionalPlanById(Long planPracticalId) {
@@ -420,18 +420,9 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
         }
 
         //上传审核文件
-        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(now);
-                ref.setUpdated(provisionalPlanVo.getUpdated());
-                ref.setUpdateTime(now);
-                sysFileRefMapper.insert(ref);
-            }
-        }
+        PlanQuarterStandardVo standardVo = new PlanQuarterStandardVo();
+        BeanUtils.copyProperties(provisionalPlanVo, standardVo);
+        quarterService.upExamineFile(standardVo);
         if (flay) {
             PmDemand demand = new PmDemand();
             BeanUtils.copyProperties(byId, demand);
@@ -481,21 +472,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
 
     @Override
     public AjaxResult auditNoPass(ProvisionalPlanVo provisionalPlanVo) {
-        Date now = new Date();
-        provisionalPlanVo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
+        PlanQuarterStandardVo standardVo = new PlanQuarterStandardVo();
+        BeanUtils.copyProperties(provisionalPlanVo, standardVo);
         //上传审核文件并赋予计划审核退回
-        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);
-            }
-        }
+        quarterService.upExamineFile(standardVo);
+        standardVo.setProjectStatus(ProjectStatus.PLANTOBACK.getCode());
         return review(provisionalPlanVo);
     }