统计分析

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

@@ -162,10 +162,21 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
     StatisticalChartsResVo countMajorProjectLastYear();
 
     /**
+     * 指项目进行到各个阶段的数量
+     * 阶段包括：待选取代理、待上传招标文件、待发布公告、待开标、待发布中标公告、中标公式中
+     *
      * @return
      */
     List<StatisticalChartsResVo> countEveryStatusNum();
 
+    /**
+     * 本年度状态为“合同待填制”、“项目建设中”、“项目建设完成”的项目
+     * 阶段包括：“合同待填制”、“项目建设中”、“项目建设完成”
+     *
+     * @return
+     */
+    List<StatisticalChartsResVo> countEveryStatusNumTwo();
+
     /**
      * 通过计划ID查询项目
      *
@@ -176,6 +187,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
 
     /**
      * 项目执行进度统计--正常推进项目数量、预算金额
+     *
      * @param pmDemandReqVo
      * @return
      */
@@ -183,6 +195,7 @@ public interface PmDemandMapper extends BaseMapper<PmDemand> {
 
     /**
      * 项目执行进度统计--未完成采购任务，预算金额
+     *
      * @param pmDemandReqVo
      * @return
      */

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

@@ -1495,11 +1495,22 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
     public AjaxResult newFinishPro() {
         // 新完成采购任务数量：本年度状态为“合同待填制”、“项目建设中”、“项目建设完成”的项目
         //        预算金额：“合同待填制”、“项目建设中”、“项目建设完成”的项目累加的预算金额
-
+        List<StatisticalChartsResVo> everyStatusNum = pmDemandMapper.countEveryStatusNumTwo();
+        if (!ObjectUtils.isEmpty(everyStatusNum) && everyStatusNum.size() > 0) {
+            for (StatisticalChartsResVo vo : everyStatusNum) {
+                switch (vo.getColumnName()) {
+                    case "15":
+                        vo.setColumnName(PmProjectStatus.CONTRACT_WAIT_FILL.getInfo());
+                    case "16":
+                        vo.setColumnName(PmProjectStatus.UNDER_CONSTRUCTION.getInfo());
+                    case "17":
+                        vo.setColumnName(PmProjectStatus.COMPLETION_CONSTRUCTION.getInfo());
+                }
+            }
+        }
 
         //合同金额：“合同待填制”、“项目建设中”、“项目建设完成”的项目累加的合同金额
-
-        return null;
+        return AjaxResult.success(everyStatusNum);
     }
 
     @Override
@@ -1525,12 +1536,6 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
             }
         }
-        //    WAIT_SELECT_AGENT("9", "待选取代理"),
-        //    WAIT_UPLOAD_BID_FILE("10", "待上传招标文件"),
-        //    WAIT_ANNOUNCEMENT("11", "待发布公告"),
-        //    WAIT_OPEN_BID("12", "待开标"),
-        //    WAIT_BID_ANNOUNCEMENT("13", "待发布中标公告"),
-        //    BIDDING_PUBLICITY("14", "中标公示中"),
         return AjaxResult.success(everyStatusNum);
     }
 

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

@@ -168,14 +168,22 @@
             , project_attr)
           AND `project_status` = #{code}
           and DATE_FORMAT(create_time
-            , '%Y') = YEAR (NOW()) - 1
+                  , '%Y') = YEAR(NOW()) - 1
     </select>
 
     <select id="countEveryStatusNum" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
         SELECT project_status columnName, COUNT(demand_id) num, SUM(evaluation) evaluationTotal
         FROM `pm_demand`
         WHERE `project_status` IN (9, 10, 11, 12, 13, 14)
-          and DATE_FORMAT(create_time, '%Y') = YEAR (NOW())
+          and DATE_FORMAT(create_time, '%Y') = YEAR(NOW())
+        GROUP BY project_status
+    </select>
+
+    <select id="countEveryStatusNumTwo" resultType="com.ozs.pm.doman.vo.responseVo.StatisticalChartsResVo">
+        SELECT project_status columnName, COUNT(demand_id) num, SUM(evaluation) evaluationTotal
+        FROM `pm_demand`
+        WHERE `project_status` IN (15, 16, 17)
+          and DATE_FORMAT(create_time, '%Y') = YEAR(NOW())
         GROUP BY project_status
     </select>