DeBugDeBugDeBug

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

@@ -3497,7 +3497,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         tThisYear.setEvaluationTotal(tThisYear.getEvaluationTotal().add(zLastYear.getEvaluationTotal()));
         tThisYear.setEvaluationContractTotal(tThisYear.getEvaluationContractTotal().add(zLastYear.getEvaluationContractTotal()));
         tThisYear.setColumnName("上年度结转和本年度提报的采购需求");
-        tThisYear.setColumnNamePlus("累计已完成采购任务数量");
+        tThisYear.setColumnNamePlus("累计完成采购任务数量");
         byChange.add(tThisYear);
         //正常推进周期内的采购任务--本年度项目未超过计划完成采购时间的数据
         StatisticalChartsResVo cThisYear = pmDemandMapper.selectCCThisYear(pmDemandReqVo);

purchase-system/src/main/resources/mapper/pm/PmDemandMapper.xml

@@ -475,7 +475,7 @@
     </select>
 
     <select id="selectMinYear" resultType="java.lang.Integer">
-        select ifnull(min(year(create_time)), year(now()))
+        select ifnull(min(year(create_time)), year(now())) mYear
         from pm_demand
     </select>