添加参数

purchase-system/src/main/java/com/ozs/plan/doman/PlanQuarter.java

@@ -147,6 +147,17 @@ public class PlanQuarter {
      */
     @TableField(exist = false)
     private String appDeleteDo;
+    /**
+     * 处理申请修改
+     * 请求根据字段 appUpdate 判断，值是true就是已申请
+     */
+    private String appUpdate;
+    /**
+     * 是否可以申请修改
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    @TableField(exist = false)
+    private String appUpdateDo;
     /**
      * 发函状态（0：未发函或已处理，1：确认发函）
      */

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

@@ -103,6 +103,16 @@ public class PlanQuarterResponseVo implements Serializable {
      * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
      */
     private String appDeleteDo;
+    /**
+     * 处理申请修改
+     * 请求根据字段 appUpdate 判断，值是true就是已申请
+     */
+    private String appUpdate;
+    /**
+     * 是否可以申请修改
+     * 请求根据字段 appDeleteDo 判断，值是true就是可以申请
+     */
+    private String appUpdateDo;
     /**
      * 计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示
      */

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

@@ -818,7 +818,8 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             } else if (!ObjectUtils.isEmpty(planQuarter.getAppDelete()) && planQuarter.getAppDelete().equals("true")) {
                 //申请过的不能再申请
                 planQuarter.setAppDeleteDo("false");
-            } else {
+            } else if (!planQuarter.getProjectStatus().equals("0")) {
+                //提交后可以申请撤销
                 planQuarter.setAppDeleteDo("true");
             }
             BeanUtils.copyProperties(planQuarter, responseVo);

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

@@ -1209,7 +1209,8 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 } else {
                     planYear.setAppDeleteDo("true");
                 }
-            } else {
+            } else if (!planYear.getProjectStatus().equals("0")) {
+                //提交后可以申请撤销
                 planYear.setAppDeleteDo("true");
             }
 

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/StatisticalChartsResVo.java

@@ -19,6 +19,10 @@ public class StatisticalChartsResVo {
      * 字段名称
      */
     private String columnName;
+    /**
+     * 字段名称
+     */
+    private String columnNamePlus;
     /**
      * 对应的数量
      */

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

@@ -1392,7 +1392,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     @Transactional(rollbackFor = Exception.class)
     public boolean insertPmBidWinning(PmBidWinningReqVo pmBidWinningReqVo) throws Exception {
         List<Long> pmBidOpeningIdList = pmBidWinningReqVo.getPmBidOpeningIdList();
-        if (ObjectUtils.isEmpty(pmBidWinningReqVo.getBidWinningAmount()) && ObjectUtils.isEmpty(pmBidWinningReqVo.getRemarks()) ) {
+        if (ObjectUtils.isEmpty(pmBidWinningReqVo.getBidWinningAmount()) && ObjectUtils.isEmpty(pmBidWinningReqVo.getRemarks())) {
             throw new Exception("中标金额或备注必须填写一个");
         }
         if (ObjectUtils.isEmpty(pmBidOpeningIdList)) {
@@ -1985,16 +1985,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         //执行滞后采购项目：本年度所有的逾期项目数
         //预算金额：本年度所有逾期项目累加的预算金额
         StatisticalChartsResVo resVo = pmDemandMapper.countProjectExceedThisYear(pmDemandReqVo);
-        resVo.setColumnName("本年度执行滞后任务新增数量");
+        resVo.setColumnName("本年度执行滞后任务");
+        resVo.setColumnNamePlus("任务新增数量");
         resVos.add(resVo);
         StatisticalChartsResVo resVo2 = pmDemandMapper.countProjectExceedThisQua(pmDemandReqVo);
-        resVo2.setColumnName("本季度执行滞后任务新增数量");
+        resVo2.setColumnName("本季度执行滞后任务");
+        resVo2.setColumnNamePlus("任务新增数量");
         resVos.add(resVo2);
         StatisticalChartsResVo resVo3 = pmDemandMapper.countProjectExceedThisMonth(pmDemandReqVo);
-        resVo3.setColumnName("本月执行滞后任务新增数量");
+        resVo3.setColumnName("本月执行滞后任务");
+        resVo3.setColumnNamePlus("任务新增数量");
         resVos.add(resVo3);
         StatisticalChartsResVo resVo4 = pmDemandMapper.countProjectExceedAllNum(pmDemandReqVo);
-        resVo4.setColumnName("累计积压的执行滞后采购任务数");
+        resVo4.setColumnName("累计执行滞后采购任务");
+        resVo4.setColumnNamePlus("采购任务数量");
         resVos.add(resVo4);
         //执行停滞采购任务数量--退回的采购任务数量
         List<String> tzrw = new ArrayList<>();
@@ -2002,7 +2006,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         pmDemandReqVo.setProjectStatusList(tzrw);
         Map<String, Object> map = pmDemandMapper.purchaseProjectDistribution(pmDemandReqVo);
         StatisticalChartsResVo resVo5 = new StatisticalChartsResVo();
-        resVo5.setColumnName("执行停滞采购任务数量");
+        resVo5.setColumnName("执行停滞");
+        resVo5.setColumnNamePlus("采购任务数量");
         resVo5.setNum(Math.toIntExact((Long) map.get("countNumber")));
         resVo5.setEvaluationTotal((BigDecimal) map.get("evaluationTotal"));
         resVos.add(resVo5);
@@ -2030,7 +2035,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     pmDemandReqVo.setQuarter(i);
                     StatisticalChartsResVo quarter = pmDemandMapper.countProjectExceedQuarter(pmDemandReqVo);
                     if (ObjectUtils.isEmpty(quarter)) {
-                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
+                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", "", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
                         quarter = vo;
                         quarter.setColumnName(chartsResVo.getColumnName() + "年第" + i + "季度");
                     }
@@ -2047,7 +2052,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     pmDemandReqVo.setMonth(i);
                     StatisticalChartsResVo month = pmDemandMapper.countProjectExceedMonth(pmDemandReqVo);
                     if (ObjectUtils.isEmpty(month)) {
-                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
+                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", "", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
                         month = vo;
                         month.setColumnName(chartsResVo.getColumnName() + "年" + i + "月");
                     }
@@ -2186,32 +2191,38 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         //本月度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo = pmDemandMapper.majorProjectByStatusThisMonthNew(pmDemandReqVo);
-        resVo.setColumnName("本月度新提报重大规划采购任务数量");
+        resVo.setColumnName("本月度新提报");
+        resVo.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo);
         //本季度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo2 = pmDemandMapper.majorProjectByStatusThisQuaNew(pmDemandReqVo);
-        resVo2.setColumnName("本季度新提报重大规划采购任务数量");
+        resVo2.setColumnName("本季度新提报");
+        resVo2.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo2);
         //本年度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo3 = pmDemandMapper.majorProjectByStatusThisYearNew(pmDemandReqVo);
-        resVo3.setColumnName("本年度新提报重大规划采购任务数量");
+        resVo3.setColumnName("本年度新提报");
+        resVo3.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo3);
         //本月度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo4 = pmDemandMapper.majorProjectByStatusThisMonthFi(pmDemandReqVo);
-        resVo4.setColumnName("本月度完成重大规划采购任务数量");
+        resVo4.setColumnName("本月度完成");
+        resVo4.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo4);
         //本季度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo5 = pmDemandMapper.majorProjectByStatusThisQuaFi(pmDemandReqVo);
-        resVo5.setColumnName("本季度完成重大规划采购任务数量");
+        resVo5.setColumnName("本季度完成");
+        resVo5.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo5);
         //本年度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo6 = pmDemandMapper.majorProjectByStatusThisYearFi(pmDemandReqVo);
-        resVo6.setColumnName("本年度完成重大规划采购任务数量");
+        resVo6.setColumnName("本年度完成");
+        resVo6.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo6);
         //上年度结转和本年度新提报重大规划采购任务累计项目数量
         List<String> yearLastZ = new ArrayList<>();
@@ -2230,22 +2241,26 @@ 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.setColumnName("上年度结转和本年度新提报累计");
+        resVo7.setColumnNamePlus("重大规划采购任务累计项目数量");
         resVo7.setNum(resVo7.getNum() + resVo3.getNum());
         resVo7.setEvaluationTotal(resVo7.getEvaluationTotal().add(resVo3.getEvaluationTotal()));
         resVos.add(resVo7);
         //今年以来累计完成数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo8 = pmDemandMapper.majorProjectByStatusToThisYear(pmDemandReqVo);
-        resVo8.setColumnName("今年以来累计完成数量");
+        resVo8.setColumnName("今年以来累计");
+        resVo8.setColumnNamePlus("以来累计完成数量");
         resVos.add(resVo8);
         //正常推进周期内的重大规划采购任务数量
         StatisticalChartsResVo resVo9 = pmDemandMapper.majorProjectByStatusWei(pmDemandReqVo);
-        resVo9.setColumnName("正常推进周期内的重大规划采购任务数量");
+        resVo9.setColumnName("正常推进周期内");
+        resVo9.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo9);
         //执行滞后的重大规划采购任务数量
         StatisticalChartsResVo resVo10 = pmDemandMapper.majorProjectByStatusChao(pmDemandReqVo);
-        resVo10.setColumnName("执行滞后的重大规划采购任务数量");
+        resVo10.setColumnName("执行滞后");
+        resVo10.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo10);
         return AjaxResult.success(resVos);
     }
@@ -2258,17 +2273,20 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         //本月度新受领重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.TASK_WAIT_RELEASE.getCode()));
         StatisticalChartsResVo resVo = pmDemandMapper.majorProjectByStatusThisMonthNew(pmDemandReqVo);
-        resVo.setColumnName("本月度新受领重大规划采购任务数量");
+        resVo.setColumnName("本月度新受领");
+        resVo.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo);
         //本季度新受领重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.TASK_WAIT_RELEASE.getCode()));
         StatisticalChartsResVo resVo2 = pmDemandMapper.majorProjectByStatusThisQuaNew(pmDemandReqVo);
-        resVo2.setColumnName("本季度新受领重大规划采购任务数量");
+        resVo2.setColumnName("本季度新受领");
+        resVo2.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo2);
         //本年度新受领重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.TASK_WAIT_RELEASE.getCode()));
         StatisticalChartsResVo resVo3 = pmDemandMapper.majorProjectByStatusThisYearNew(pmDemandReqVo);
-        resVo3.setColumnName("本年度新受领重大规划采购任务数量");
+        resVo3.setColumnName("本年度新受领");
+        resVo3.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo3);
         //上年度结转重大规划采购任务累计项目数量
         List<String> yearLastZ = new ArrayList<>();
@@ -2284,55 +2302,65 @@ 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.setColumnName("上年度结转和本年度新提报累计");
+        resVo7.setColumnNamePlus("重大规划采购任务累计项目数量");
         //上年度结转和本月度新受领重大规划采购任务累计项目数量预算金额
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo4 = pmDemandMapper.majorProjectByStatusThisMonthFiCGB(pmDemandReqVo);
-        resVo4.setColumnName("上年度结转和本月度新受领重大规划采购任务累计项目数量预算金额(万元)");
+        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.setColumnName("上年度结转和本季度新受领累计");
+        resVo5.setColumnNamePlus("重大规划采购任务累计项目数量");
         resVo5.setNum(resVo5.getNum() + resVo7.getNum());
         resVo5.setEvaluationTotal(resVo5.getEvaluationTotal().add(resVo7.getEvaluationTotal()));
         resVos.add(resVo5);
         //上年度结转和本年度新受领重大规划采购任务累计项目数量预算金额
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
         StatisticalChartsResVo resVo6 = pmDemandMapper.majorProjectByStatusThisYearFiCGB(pmDemandReqVo);
-        resVo6.setColumnName("上年度结转和本年度新受领重大规划采购任务累计项目数量预算金额(万元)");
+        resVo6.setColumnName("上年度结转和本年度新受领");
+        resVo6.setColumnNamePlus("重大规划采购任务累计项目数量");
         resVo6.setNum(resVo6.getNum() + resVo7.getNum());
         resVo6.setEvaluationTotal(resVo6.getEvaluationTotal().add(resVo7.getEvaluationTotal()));
         resVos.add(resVo6);
         //本月度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoA = pmDemandMapper.majorProjectByStatusThisMonthFi(pmDemandReqVo);
-        resVoA.setColumnName("本月度完成重大规划采购任务数量");
+        resVoA.setColumnName("本月度完成");
+        resVoA.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoA);
         //本季度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoB = pmDemandMapper.majorProjectByStatusThisQuaFi(pmDemandReqVo);
-        resVoB.setColumnName("本季度完成重大规划采购任务数量");
+        resVoB.setColumnName("本季度完成");
+        resVoB.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoB);
         //本年度完成重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoC = pmDemandMapper.majorProjectByStatusThisYearFi(pmDemandReqVo);
-        resVoC.setColumnName("本年度完成重大规划采购任务数量");
+        resVoC.setColumnName("本年度完成");
+        resVoC.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoC);
         //今年以来累计完成数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo8 = pmDemandMapper.majorProjectByStatusToThisYear(pmDemandReqVo);
-        resVo8.setColumnName("今年以来累计完成数量");
+        resVo8.setColumnName("今年以来累计");
+        resVo8.setColumnNamePlus("累计完成数量");
         resVos.add(resVo8);
         //正常推进周期内的重大规划采购任务数量
         StatisticalChartsResVo resVo9 = pmDemandMapper.majorProjectByStatusWei(pmDemandReqVo);
-        resVo9.setColumnName("正常推进周期内的重大规划采购任务数量");
+        resVo9.setColumnName("正常推进周期内");
+        resVo9.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo9);
         //执行滞后的重大规划采购任务数量
         StatisticalChartsResVo resVo10 = pmDemandMapper.majorProjectByStatusChao(pmDemandReqVo);
-        resVo10.setColumnName("执行滞后的重大规划采购任务数量");
+        resVo10.setColumnName("执行滞后");
+        resVo10.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo10);
         return AjaxResult.success(resVos);
     }
@@ -3341,19 +3369,22 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<StatisticalChartsResVo> resVos = new ArrayList<>();
         //本级和所属采购单位新提报采购需求数量--本年度中本级及下级审核的“需求待提交”之后状态的数据
         StatisticalChartsResVo selectSTS = pmDemandMapper.selectSTS(pmDemandReqVo);
-        selectSTS.setColumnName("本级和所属采购单位新提报采购需求数量");
+        selectSTS.setColumnName("本级和所属采购单位新提报");
+        selectSTS.setColumnNamePlus("采购需求数量");
         resVos.add(selectSTS);
         //上年度结转和本年度提报的采购需求累计数量
         //1.上年度结转：上年度“需求待提交”之后，“合同待填制”之前状态的数据
         //2.本年度提报：指本年度“需求待提交”之后状态的数据
         StatisticalChartsResVo lastYear = pmDemandMapper.selectSTSLastYear(pmDemandReqVo);
         StatisticalChartsResVo thisYear = pmDemandMapper.selectSTSThisYear(pmDemandReqVo);
-        lastYear.setColumnName("上年度结转和本年度提报的采购需求累计数量");
+        lastYear.setColumnName("上年度结转和本年度提报");
+        lastYear.setColumnNamePlus("采购需求累计数量");
         lastYear.setNum(lastYear.getNum() + thisYear.getNum());
         resVos.add(lastYear);
         //未按季度采购明细计划提报或调整延迟的数量--超过计划需求提报时间的项目
         StatisticalChartsResVo meiJiDu = pmDemandMapper.selectmeiJiDu(pmDemandReqVo);
-        meiJiDu.setColumnName("未按季度采购明细计划提报或调整延迟的数量");
+        meiJiDu.setColumnName("未按季度采购明细计划提报或调整延迟");
+        meiJiDu.setColumnNamePlus("采购需求数量");
         resVos.add(meiJiDu);
         return resVos;
     }
@@ -3390,11 +3421,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<StatisticalChartsResVo> byChange = new ArrayList<>();
         //本月相关采购机构完成采购任务--状态为“标后质疑”后的数据
         StatisticalChartsResVo thisMonth = pmDemandMapper.selectCGThisMonth(pmDemandReqVo);
-        thisMonth.setColumnName("本月相关采购机构完成采购任务");
+        thisMonth.setColumnName("本月相关采购机构");
+        thisMonth.setColumnNamePlus("完成采购任务数量");
         byChange.add(thisMonth);
         //本季度相关采购机构完成采购任务--状态为“标后质疑”后的数据
         StatisticalChartsResVo thisQua = pmDemandMapper.selectCGThisQua(pmDemandReqVo);
-        thisQua.setColumnName("本季度相关采购机构完成采购任务");
+        thisQua.setColumnName("本季度相关采购机构");
+        thisQua.setColumnNamePlus("完成采购任务数量");
         byChange.add(thisQua);
         //上年度结转和本年度提报的采购需求中累计已完成的采购任务
         //上年度结转：上年度“标后质疑”之后，“合同待填制”之前状态的数据
@@ -3404,11 +3437,13 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         tThisYear.setNum(tThisYear.getNum() + zLastYear.getNum());
         tThisYear.setEvaluationTotal(tThisYear.getEvaluationTotal().add(zLastYear.getEvaluationTotal()));
         tThisYear.setEvaluationContractTotal(tThisYear.getEvaluationContractTotal().add(zLastYear.getEvaluationContractTotal()));
-        tThisYear.setColumnName("上年度结转和本年度提报的采购需求中累计已完成的采购任务");
+        tThisYear.setColumnName("上年度结转和本年度提报的采购需求");
+        tThisYear.setColumnNamePlus("累计已完成采购任务数量");
         byChange.add(tThisYear);
         //正常推进周期内的采购任务--本年度项目未超过计划完成采购时间的数据
         StatisticalChartsResVo cThisYear = pmDemandMapper.selectCCThisYear(pmDemandReqVo);
-        cThisYear.setColumnName("正常推进周期内的采购任务");
+        cThisYear.setColumnName("正常推进周期内");
+        cThisYear.setColumnNamePlus("采购任务数量");
         byChange.add(cThisYear);
         return byChange;
     }
@@ -3620,7 +3655,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     pmDemandReqVo.setQuarter(i);
                     StatisticalChartsResVo quarter = pmDemandMapper.countProjectACT_Qua(pmDemandReqVo);
                     if (ObjectUtils.isEmpty(quarter)) {
-                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
+                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", "", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
                         quarter = vo;
                         quarter.setColumnName(chartsResVo.getColumnName() + "年第" + i + "季度");
                     }
@@ -3637,7 +3672,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                     pmDemandReqVo.setMonth(i);
                     StatisticalChartsResVo month = pmDemandMapper.countProjectACT_Mon(pmDemandReqVo);
                     if (ObjectUtils.isEmpty(month)) {
-                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
+                        StatisticalChartsResVo vo = new StatisticalChartsResVo("", "", 0, BigDecimal.valueOf(0), BigDecimal.valueOf(0));
                         month = vo;
                         month.setColumnName(chartsResVo.getColumnName() + "年" + i + "月");
                     }