統計分析

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

@@ -177,7 +177,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      * @param
      * @return
      */
-    StatisticalChartsResVo majorProjectByStatusThisMonthNew(@Param("vo") PmDemandReqVo pmDemandReqVo);
+    StatisticalChartsResVo majorProjectByStatusThisMonthSub(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
      * 本季度新提报重大规划采购任务数量
@@ -185,7 +185,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      * @param
      * @return
      */
-    StatisticalChartsResVo majorProjectByStatusThisQuaNew(@Param("vo") PmDemandReqVo pmDemandReqVo);
+    StatisticalChartsResVo majorProjectByStatusThisQuaSub(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**
      * 本年度新提报重大规划采购任务数量
@@ -193,6 +193,30 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
      * @param
      * @return
      */
+    StatisticalChartsResVo majorProjectByStatusThisYearSub(@Param("vo") PmDemandReqVo pmDemandReqVo);
+
+    /**
+     * 本月度新受领重大规划采购任务数量
+     *
+     * @param
+     * @return
+     */
+    StatisticalChartsResVo majorProjectByStatusThisMonthNew(@Param("vo") PmDemandReqVo pmDemandReqVo);
+
+    /**
+     * 本季度新受领重大规划采购任务数量
+     *
+     * @param
+     * @return
+     */
+    StatisticalChartsResVo majorProjectByStatusThisQuaNew(@Param("vo") PmDemandReqVo pmDemandReqVo);
+
+    /**
+     * 本年度新受领重大规划采购任务数量
+     *
+     * @param
+     * @return
+     */
     StatisticalChartsResVo majorProjectByStatusThisYearNew(@Param("vo") PmDemandReqVo pmDemandReqVo);
 
     /**

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

@@ -2441,19 +2441,19 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         List<StatisticalChartsResVo> resVos = new ArrayList<>();
         //本月度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
-        StatisticalChartsResVo resVo = pmDemandMapper.majorProjectByStatusThisMonthNew(pmDemandReqVo);
+        StatisticalChartsResVo resVo = pmDemandMapper.majorProjectByStatusThisMonthSub(pmDemandReqVo);
         resVo.setColumnName("本月度新提报");
         resVo.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo);
         //本季度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
-        StatisticalChartsResVo resVo2 = pmDemandMapper.majorProjectByStatusThisQuaNew(pmDemandReqVo);
+        StatisticalChartsResVo resVo2 = pmDemandMapper.majorProjectByStatusThisQuaSub(pmDemandReqVo);
         resVo2.setColumnName("本季度新提报");
         resVo2.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo2);
         //本年度新提报重大规划采购任务数量
         pmDemandReqVo.setProjectStatus(Long.valueOf(PmProjectStatus.DEMAND_WAIT_COMMIT.getCode()));
-        StatisticalChartsResVo resVo3 = pmDemandMapper.majorProjectByStatusThisYearNew(pmDemandReqVo);
+        StatisticalChartsResVo resVo3 = pmDemandMapper.majorProjectByStatusThisYearSub(pmDemandReqVo);
         resVo3.setColumnName("本年度新提报");
         resVo3.setColumnNamePlus("重大规划采购任务数量");
         resVos.add(resVo3);

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

@@ -148,7 +148,7 @@
         SELECT ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        ( real_purchase_finish_time > plan_purchase_finish_time )
+        now()> plan_purchase_finish_time and ISNULL(real_purchase_finish_time)
         and YEAR(plan_demand_sub_time) = YEAR(NOW())
     </select>
 
@@ -157,7 +157,7 @@
         SELECT ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        ( real_purchase_finish_time > plan_purchase_finish_time )
+        now()> plan_purchase_finish_time and ISNULL(real_purchase_finish_time)
         and quarter(plan_demand_sub_time) = quarter(NOW())
     </select>
 
@@ -166,7 +166,7 @@
         SELECT ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        ( real_purchase_finish_time > plan_purchase_finish_time )
+        now()> plan_purchase_finish_time and ISNULL(real_purchase_finish_time)
         and MONTH(plan_demand_sub_time) = MONTH(NOW())
     </select>
 
@@ -175,7 +175,7 @@
         SELECT ifnull(COUNT(demand_id), 0) num, ifnull(sum(evaluation), 0) evaluationTotal
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        ( real_purchase_finish_time > plan_purchase_finish_time)
+        now()> plan_purchase_finish_time and ISNULL(real_purchase_finish_time)
     </select>
 
     <select id="countProjectExceedTZ" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
@@ -258,7 +258,7 @@
         SELECT *
         FROM `pm_demand`
         <include refid="deptListOrDemandIdAll"/>
-        real_purchase_finish_time > plan_purchase_finish_time
+        now()> plan_purchase_finish_time and ISNULL(real_purchase_finish_time)
     </select>
 
     <sql id="majorProjectByStatus">
@@ -268,6 +268,25 @@
         find_in_set('1', project_attr)
     </sql>
 
+    <select id="majorProjectByStatusThisMonthSub" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
+            resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
+        <include refid="majorProjectByStatus"/>
+        AND MONTH(plan_demand_sub_time ) = MONTH(now())
+        AND project_status &gt; #{vo.projectStatus}
+    </select>
+    <select id="majorProjectByStatusThisQuaSub" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
+            resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
+        <include refid="majorProjectByStatus"/>
+        AND QUARTER(plan_demand_sub_time ) = QUARTER(now())
+        AND project_status &gt; #{vo.projectStatus}
+    </select>
+    <select id="majorProjectByStatusThisYearSub" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
+            resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
+        <include refid="majorProjectByStatus"/>
+        AND YEAR(plan_demand_sub_time ) = YEAR(now())
+        AND project_status &gt; #{vo.projectStatus}
+    </select>
+
     <select id="majorProjectByStatusThisMonthNew" parameterType="com.ozs.pm.doman.vo.requestVo.PmDemandReqVo"
             resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         <include refid="majorProjectByStatus"/>
@@ -746,11 +765,11 @@
         FROM pm_demand d,pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 16 AND MONTH(plan_demand_sub_time) =MONTH(NOW()) ) de
+        project_status &gt; 16 AND MONTH(up_acceptance_time) =MONTH(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 16
-        AND MONTH(d.plan_demand_sub_time) = MONTH(NOW())
+        AND MONTH(d.up_acceptance_time) = MONTH(NOW())
     </select>
 
     <select id="selectCGThisQua" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -760,11 +779,11 @@
         FROM pm_demand d,pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 17 AND QUARTER(plan_demand_sub_time) =QUARTER(NOW()) ) de
+        project_status &gt; 17 AND QUARTER(up_acceptance_time) =QUARTER(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 17
-        AND QUARTER(d.plan_demand_sub_time) = QUARTER(NOW())
+        AND QUARTER(d.up_acceptance_time) = QUARTER(NOW())
     </select>
 
     <select id="selectZJLastYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -774,11 +793,11 @@
         FROM pm_demand d, pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status IN (17,18) AND YEAR(plan_demand_sub_time) = YEAR(NOW())-1 ) de
+        project_status IN (17,18) AND YEAR(up_acceptance_time) = YEAR(NOW())-1 ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status IN (17,18)
-        AND YEAR(d.plan_demand_sub_time) = YEAR(NOW())-1
+        AND YEAR(d.up_acceptance_time) = YEAR(NOW())-1
     </select>
 
     <select id="selectTBThisYear" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -788,11 +807,11 @@
         FROM pm_demand d, pm_contract_info c,
         (SELECT ifnull(COUNT(demand_id), 0) num ,ifnull(sum(evaluation), 0) evaluationTotal FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
-        project_status &gt; 17 AND YEAR(plan_demand_sub_time) = YEAR(NOW()) ) de
+        project_status &gt; 17 AND YEAR(up_acceptance_time) = YEAR(NOW()) ) de
         <include refid="dDeptListOrDemandIdAll"/>
         d.demand_id = c.demand_id
         AND d.project_status &gt; 17
-        AND YEAR(d.plan_demand_sub_time) = YEAR(NOW())
+        AND YEAR(d.up_acceptance_time) = YEAR(NOW())
     </select>
 
     <select id="selectFInishAll" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo"
@@ -813,7 +832,7 @@
         FROM pm_demand
         <include refid="deptListOrDemandIdAll"/>
         real_purchase_finish_time &lt;=plan_purchase_finish_time
-        AND YEAR(plan_demand_sub_time) = YEAR(NOW())
+        AND YEAR(up_acceptance_time) = YEAR(NOW())
     </select>
 
     <sql id="countProjectExceedAndStatus">