添加审核参数

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -103,6 +103,17 @@ public class PlanYearsResponseVo implements Serializable {
      * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
      */
     private String appDeleteDo;
+    /**
+     * 处理申请修改
+     * 请求根据字段 appUpdate 判断，值是true就是已申请
+     */
+    private String appUpdate;
+    /**
+     * 是否可以申请修改
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    private String appUpdateDo;
+
     /**
      * 退回原因--->审核不通过就是退回
      */

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -2241,8 +2241,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         yearLastZ.add(PmProjectStatus.WASTE_BID_RETURN.getCode());
         pmDemandReqVo.setProjectStatusList(yearLastZ);
         StatisticalChartsResVo resVo7 = pmDemandMapper.majorProjectByStatusLastYear(pmDemandReqVo);
-        resVo7.setColumnName("上年度结转和本年度新提报累计");
-        resVo7.setColumnNamePlus("重大规划采购任务累计项目数量");
+        resVo7.setColumnName("上年度结转和本年度新提报");
+        resVo7.setColumnNamePlus("采购任务累计数量");
         resVo7.setNum(resVo7.getNum() + resVo3.getNum());
         resVo7.setEvaluationTotal(resVo7.getEvaluationTotal().add(resVo3.getEvaluationTotal()));
         resVos.add(resVo7);
@@ -2250,7 +2250,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo8 = pmDemandMapper.majorProjectByStatusToThisYear(pmDemandReqVo);
         resVo8.setColumnName("今年以来累计");
-        resVo8.setColumnNamePlus("以来累计完成数量");
+        resVo8.setColumnNamePlus("累计完成数量");
         resVos.add(resVo8);
         //正常推进周期内的重大规划采购任务数量
         StatisticalChartsResVo resVo9 = pmDemandMapper.majorProjectByStatusWei(pmDemandReqVo);
@@ -2302,21 +2302,21 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         yearLastZ.add(PmProjectStatus.WASTE_BID_RETURN.getCode());
         pmDemandReqVo.setProjectStatusList(yearLastZ);
         StatisticalChartsResVo resVo7 = pmDemandMapper.majorProjectByStatusLastYear(pmDemandReqVo);
-        resVo7.setColumnName("上年度结转和本年度新提报累计");
-        resVo7.setColumnNamePlus("重大规划采购任务累计项目数量");
+        resVo7.setColumnName("上年度结转和本年度新提报");
+        resVo7.setColumnNamePlus("累计项目数量");
         //上年度结转和本月度新受领重大规划采购任务累计项目数量预算金额
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo4 = pmDemandMapper.majorProjectByStatusThisMonthFiCGB(pmDemandReqVo);
-        resVo4.setColumnName("上年度结转和本月度新受领累计");
-        resVo4.setColumnNamePlus("重大规划采购任务累计项目数量");
+        resVo4.setColumnName("上年度结转和本月度新受领");
+        resVo4.setColumnNamePlus("累计项目数量");
         resVo4.setNum(resVo4.getNum() + resVo7.getNum());
         resVo4.setEvaluationTotal(resVo4.getEvaluationTotal().add(resVo7.getEvaluationTotal()));
         resVos.add(resVo4);
         //上年度结转和本季度新受领重大规划采购任务累计项目数量预算金额
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo5 = pmDemandMapper.majorProjectByStatusThisQuaFiCGB(pmDemandReqVo);
-        resVo5.setColumnName("上年度结转和本季度新受领累计");
-        resVo5.setColumnNamePlus("重大规划采购任务累计项目数量");
+        resVo5.setColumnName("上年度结转和本季度新受领");
+        resVo5.setColumnNamePlus("累计项目数量");
         resVo5.setNum(resVo5.getNum() + resVo7.getNum());
         resVo5.setEvaluationTotal(resVo5.getEvaluationTotal().add(resVo7.getEvaluationTotal()));
         resVos.add(resVo5);
@@ -2324,7 +2324,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo6 = pmDemandMapper.majorProjectByStatusThisYearFiCGB(pmDemandReqVo);
         resVo6.setColumnName("上年度结转和本年度新受领");
-        resVo6.setColumnNamePlus("重大规划采购任务累计项目数量");
+        resVo6.setColumnNamePlus("累计项目数量");
         resVo6.setNum(resVo6.getNum() + resVo7.getNum());
         resVo6.setEvaluationTotal(resVo6.getEvaluationTotal().add(resVo7.getEvaluationTotal()));
         resVos.add(resVo6);