bug

purchase-system/src/main/java/com/ozs/pm/mapper/PmDemandMapper.java

@@ -245,7 +245,8 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
     StatisticalChartsResVo majorProjectByStatusLastYear(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
-     * 累计“合同待填制”之前状态的项目属性为重大规划任务项目的数据
+     * 累计“合同待填制”之后状态的项目属性为重大规划任务项目的数据
+     * （包含“合同待填制”）
      *
      * @param
      * @return

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

@@ -2549,25 +2549,25 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         resVo6.setColumnNamePlus("累计项目数量");
         resVos.add(resVo6);
         //本月度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoA = pmDemandMapper.majorProjectByStatusThisMonthFi(pmDemandReqVo);
         resVoA.setColumnName("本月度完成");
         resVoA.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoA);
         //本季度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoB = pmDemandMapper.majorProjectByStatusThisQuaFi(pmDemandReqVo);
         resVoB.setColumnName("本季度完成");
         resVoB.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoB);
         //本年度完成重大规划采购任务数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVoC = pmDemandMapper.majorProjectByStatusThisYearFi(pmDemandReqVo);
         resVoC.setColumnName("本年度完成");
         resVoC.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVoC);
         //今年以来累计完成数量
-        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.WASTE_BID_RETURN.getCode()));
+        pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.CONTRACT_WAIT_FILL.getCode()));
         StatisticalChartsResVo resVo8 = pmDemandMapper.majorProjectByStatusToThisYear(pmDemandReqVo);
         resVo8.setColumnName("今年以来累计");
         resVo8.setColumnNamePlus("累计完成数量");

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

@@ -277,19 +277,19 @@
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
         AND MONTH(create_time ) = MONTH(now())
-        AND project_status &lt; #{vo.projectStatus}
+        AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisQuaFi" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
         AND QUARTER(create_time ) = QUARTER(now())
-        AND project_status &lt; #{vo.projectStatus}
+        AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisYearFi" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
         AND YEAR(create_time ) = YEAR(now())
-        AND project_status &lt; #{vo.projectStatus}
+        AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusThisMonthFiCGB" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
@@ -324,7 +324,7 @@
     <select id="majorProjectByStatusToThisYear" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
-        AND project_status &lt; #{vo.projectStatus}
+        AND project_status &gt;= #{vo.projectStatus}
     </select>
     <select id="majorProjectByStatusWei" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">