添加审核参数

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -222,6 +222,14 @@ public class PlanQuarterController extends BaseController {
         return quarterService.appUpdate(quarterStandardVo);
     }
 
+    @ApiOperation(value = "处理申请修改季度计划（或临时计划）")
+    @PostMapping("/handleAppUpdate")
+    @PreAuthorize("@ss.hasPermi('plan:quarter:handleAppUpdate')")
+    @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
+    public AjaxResult handleAppUpdate(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
+        return quarterService.handleAppUpdate(quarterStandardVo);
+    }
+
     @ApiOperation(value = "申请撤销季度计划")
     @PostMapping("/appDelete")
     @PreAuthorize("@ss.hasPermi('plan:quarter:appDelete')")

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -226,14 +226,6 @@ public class PlanYearsController extends BaseController {
         return planYearsService.reviewReturn(yearsStandardVo);
     }
 
-    @ApiOperation(value = "申请修改年度计划")
-    @PostMapping("/appUpdate")
-    @PreAuthorize("@ss.hasPermi('plan:planYears:appUpdate')")
-    @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
-    public AjaxResult appUpdate(@RequestBody PlanYearsStandardVo yearsStandardVo) {
-        return planYearsService.appUpdate(yearsStandardVo);
-    }
-
     @ApiOperation(value = "申请撤销年度计划")
     @PostMapping("/appDelete")
     @PreAuthorize("@ss.hasPermi('plan:planYears:appDelete')")

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

@@ -113,13 +113,21 @@ public interface PlanQuarterService extends IService<PlanQuarter> {
     public void upExamineFile(PlanQuarterStandardVo vo);
 
     /**
-     * 申请修改季度计划
+     * 申请修改季度计划（或临时计划）
      *
      * @param quarterStandardVo 需要修改的季度计划
      * @return 结果
      */
     public AjaxResult appUpdate(PlanQuarterStandardVo quarterStandardVo);
 
+    /**
+     * 申请修改季度计划处理
+     *
+     * @param quarterStandardVo 需要修改的季度计划
+     * @return 结果
+     */
+    public AjaxResult handleAppUpdate(PlanQuarterStandardVo quarterStandardVo);
+
     /**
      * 发函催告
      *

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

@@ -106,14 +106,6 @@ public interface PlanYearsService extends IService<PlanYears> {
      */
     public AjaxResult reviewReturn(PlanYearsStandardVo yearsStandardVo);
 
-    /**
-     * 申请修改年度计划
-     *
-     * @param yearsStandardVo 需要修改的年度计划
-     * @return 结果
-     */
-    public AjaxResult appUpdate(PlanYearsStandardVo yearsStandardVo);
-
     /**
      * 发函催告
      *

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

@@ -272,6 +272,18 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             e.printStackTrace();
         }
         quarters.setUpdateTime(now);
+        PlanQuarter byId = planQuarterMapper.selectById(quarters.getPlanPracticalId());
+
+        //临时计划修改后要更新年度计划
+        if (byId.getPlanType().equals(Integer.parseInt("1"))) {
+            if (!ObjectUtils.isEmpty(planYearsMapper.selectById(byId.getPlanYearId()))) {
+                PlanYears years = new PlanYears();
+                BeanUtils.copyProperties(quarterStandardVo, years);
+                years.setProjectAttr(null);
+                years.setPlanYearId(null);
+                planYearsMapper.updateById(years);
+            }
+        }
         planQuarterMapper.updateById(quarters);
         List<SysFileRef> sysFileRefs = quarterStandardVo.getSysFileRefs();
         if (!ObjectUtils.isEmpty(sysFileRefs)) {
@@ -388,6 +400,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
         return AjaxResult.success();
     }
 
+    //是否已存在--关联审核部门
     static void refIsExist(PmAuditDeptRef ref, PmAuditDeptRefMapper pmAuditDeptRefMapper) {
         LambdaQueryWrapper<PmAuditDeptRef> lp = new LambdaQueryWrapper<>();
         lp.eq(PmAuditDeptRef::getRefId, ref.getRefId());
@@ -534,20 +547,35 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
 
     @Override
     public AjaxResult appUpdate(PlanQuarterStandardVo vo) {
-        //如果项目管理中数据已填制，则不允许申请修改
-        LambdaQueryWrapper<PmDemand> demandLp = new LambdaQueryWrapper<>();
-        demandLp.eq(PmDemand::getPlanId, vo.getPlanPracticalId());
-        PmDemand demand = pmDemandMapper.selectOne(demandLp);
-        if (!String.valueOf(demand.getProjectStatus()).equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
-            return AjaxResult.error("项目信息已填制，不可更改");
-        }
         //申请后会成为未提交的状态，可以进行修改
-        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planQuarterMapper.review(vo);
-        if (review != 1) {
-            return AjaxResult.error("项目状态数据异常");
-        }
-        return AjaxResult.success();
+        PlanQuarter planQuarter = new PlanQuarter();
+        BeanUtils.copyProperties(vo, planQuarter);
+        planQuarter.setAppUpdate("true");
+        planQuarterMapper.updateById(planQuarter);
+        return AjaxResult.success("申请成功");
+    }
+
+    @Override
+    @Transactional
+    public AjaxResult handleAppUpdate(PlanQuarterStandardVo vo) {
+        //getProjectAttr传值1为同意。-1为拒绝
+        PlanQuarter planQuarter = new PlanQuarter();
+        BeanUtils.copyProperties(vo, planQuarter);
+        PlanQuarter byId = planQuarterMapper.getById(planQuarter.getPlanPracticalId());
+        //同意修改申请
+        if ("1".equals(vo.getProjectAttr())) {
+
+            planQuarter.setProjectAttr(null);
+            planQuarter.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
+            planQuarterMapper.updateById(planQuarter);
+            //planQuarterMapper.review(vo);
+            planQuarterMapper.deletePlanQuarterById(vo.getPlanPracticalId());
+            return AjaxResult.success("已同意该修改申请");
+        }
+        planQuarter.setProjectAttr(null);
+        planQuarter.setAppDelete("false");
+        planQuarterMapper.updateById(planQuarter);
+        return AjaxResult.success("已拒绝改申请");
     }
 
     @Override
@@ -668,10 +696,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
 
     @Override
     public AjaxResult appDelete(PlanQuarterStandardVo quarterStandardVo) {
-        PmDemand demand = demandService.selectByPlanId(quarterStandardVo.getPlanPracticalId());
-        if (!ObjectUtils.isEmpty(demand) && !demand.getProjectStatus().equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
-            return AjaxResult.error("需求已建档，不可撤销");
-        }
         PlanQuarter planQuarter = new PlanQuarter();
         BeanUtils.copyProperties(quarterStandardVo, planQuarter);
         planQuarter.setAppDelete("true");
@@ -810,17 +834,34 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     }
                 }
             }
-            //是否可以申请撤销
+            //是否可以申请撤销和申请修改
             //需求待填制可以申请，需求建档就不能申请
             PmDemand demand = demandService.selectByPlanId(planQuarter.getPlanPracticalId());
             if (!ObjectUtils.isEmpty(demand) && !demand.getProjectStatus().equals(PmProjectStatus.DEMAND_WAIT_FILL.getCode())) {
                 planQuarter.setAppDeleteDo("false");
-            } else if (!ObjectUtils.isEmpty(planQuarter.getAppDelete()) && planQuarter.getAppDelete().equals("true")) {
-                //申请过的不能再申请
-                planQuarter.setAppDeleteDo("false");
-            } else if (!planQuarter.getProjectStatus().equals("0")) {
-                //提交后可以申请撤销
-                planQuarter.setAppDeleteDo("true");
+                planQuarter.setAppUpdateDo("false");
+            } else {
+                //能否申请撤销
+                if (!ObjectUtils.isEmpty(planQuarter.getAppDelete()) && planQuarter.getAppDelete().equals("true")) {
+                    //申请过的不能再申请
+                    planQuarter.setAppDeleteDo("false");
+                } else if (!planQuarter.getProjectStatus().equals("0")) {
+                    //提交后可以申请撤销
+                    planQuarter.setAppDeleteDo("false");
+                } else {
+                    planQuarter.setAppDeleteDo("true");
+                }
+                //能否申请修改
+                if (!ObjectUtils.isEmpty(planQuarter.getAppUpdate()) && planQuarter.getAppUpdate().equals("true")) {
+                    //申请过的不能再申请
+                    planQuarter.setAppUpdateDo("false");
+                } else if (!planQuarter.getProjectStatus().equals("0")) {
+                    //提交后可以申请撤销
+                    planQuarter.setAppUpdateDo("false");
+                } else {
+                    planQuarter.setAppUpdateDo("true");
+                }
+
             }
             BeanUtils.copyProperties(planQuarter, responseVo);
             try {

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

@@ -507,16 +507,6 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         return AjaxResult.success();
     }
 
-    @Override
-    public AjaxResult appUpdate(PlanYearsStandardVo vo) {
-        //申请后会成为未提交的状态，可以进行修改
-        vo.setProjectStatus(ProjectStatus.PLANWAITCOMMIT.getCode());
-        int review = planYearsMapper.review(vo);
-        if (review != 1) {
-            return AjaxResult.error("项目状态数据异常");
-        }
-        return AjaxResult.success();
-    }
 
     @Override
     public AjaxResult sendLetter(PlanYearsStandardVo yearsStandardVo) {