字段赋值补充

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

@@ -793,7 +793,6 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                     }
                 }
             }
-            BeanUtils.copyProperties(planQuarter, responseVo);
             //是否可以申请撤销
             //需求待填制可以申请，需求建档就不能申请
             PmDemand demand = demandService.selectByPlanId(planQuarter.getPlanPracticalId());
@@ -805,6 +804,7 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
             } else {
                 planQuarter.setAppDeleteDo("true");
             }
+            BeanUtils.copyProperties(planQuarter, responseVo);
             try {
                 responseVo.setTipsMessage(planQuarterGetTips(thresholdMap, alertTimeMap));
             } catch (ParseException e) {

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

@@ -3339,6 +3339,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<StatisticalChartsResVo> resVos = new ArrayList<>();
         //本级和所属采购单位新提报采购需求数量--本年度中本级及下级审核的“需求待提交”之后状态的数据
         StatisticalChartsResVo selectSTS = pmDemandMapper.selectSTS(pmDemandReqVo);
+        selectSTS.setColumnName("本级和所属采购单位新提报采购需求数量");
         resVos.add(selectSTS);
         //上年度结转和本年度提报的采购需求累计数量
         //1.上年度结转：上年度“需求待提交”之后，“合同待填制”之前状态的数据
@@ -3387,9 +3388,11 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<StatisticalChartsResVo> byChange = new ArrayList<>();
         //本月相关采购机构完成采购任务--状态为“标后质疑”后的数据
         StatisticalChartsResVo thisMonth = pmDemandMapper.selectCGThisMonth(pmDemandReqVo);
+        thisMonth.setColumnName("本月相关采购机构完成采购任务");
         byChange.add(thisMonth);
         //本季度相关采购机构完成采购任务--状态为“标后质疑”后的数据
         StatisticalChartsResVo thisQua = pmDemandMapper.selectCGThisQua(pmDemandReqVo);
+        thisQua.setColumnName("本季度相关采购机构完成采购任务");
         byChange.add(thisQua);
         //上年度结转和本年度提报的采购需求中累计已完成的采购任务
         //上年度结转：上年度“标后质疑”之后，“合同待填制”之前状态的数据
@@ -3403,6 +3406,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         byChange.add(tThisYear);
         //正常推进周期内的采购任务--本年度项目未超过计划完成采购时间的数据
         StatisticalChartsResVo cThisYear = pmDemandMapper.selectCCThisYear(pmDemandReqVo);
+        cThisYear.setColumnName("上年度结转和本年度提报的采购需求中累计已完成的采购任务");
         byChange.add(cThisYear);
         return byChange;
     }