From 5c0482249e21dbefc9604b5437bad997aeb40570 Mon Sep 17 00:00:00 2001
From: lst <lst@peony.cn>
Date: Tue, 23 Jul 2024 16:33:07 +0800
Subject: [PATCH] 开发：项目汇总表

---
 backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java                  |  2 +-
 backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java | 11 +++++++++--
 backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml                            | 32 ++++++++++++++++----------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
index 5250027..7f51df2 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
@@ -41,7 +41,7 @@ public interface WProjectLibraryInventoryDao extends BaseMapper<WProjectLibraryI
      * @param orgIdList
      * @return
      */
-    List<HashMap<String, Object>> investmentScaleStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("list")ArrayList<String> orgIdList);
+    HashMap<String, Object> investmentScaleStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("list")ArrayList<String> orgIdList);
 
     /**
      * 项目主体项目占比
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
index e131977..1e31ac7 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
@@ -51,8 +51,15 @@ public class WProjectLibraryInventoryManagerImpl extends BaseManagerImpl<WProjec
         List<String> xmpjList = baseMapper.listDictByKey("xmpj");
         List<HashMap<String, Object>> xmzlMap = baseMapper.projectRatingStatistics(startDate, endDate, orgIdList, xmpjList);
         map.put("XMZL", xmzlMap);
-        List<HashMap<String, Object>> tzgmMap = baseMapper.investmentScaleStatistics(startDate, endDate, orgIdList);
-        map.put("TZGM", tzgmMap);
+        HashMap<String, Object> tzgmMap = baseMapper.investmentScaleStatistics(startDate, endDate, orgIdList);
+        ArrayList<HashMap> tzgmList = new ArrayList<>();
+        for (String key : tzgmMap.keySet()) {
+            HashMap<String, Object> tzgm = new HashMap<>();
+            tzgm.put("name", key);
+            tzgm.put("value", tzgmMap.get(key));
+            tzgmList.add(tzgm);
+        }
+        map.put("TZGM", tzgmList);
 
         List<HashMap<String, Object>> xmztxmzbMap = baseMapper.orgNameProjectStatistics(startDate, endDate, orgIdList);
         map.put("XMZTXMZB", xmztxmzbMap);
diff --git a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
index 0e75afe..357bdf2 100644
--- a/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
+++ b/backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
@@ -81,23 +81,23 @@
 
     <select id="basicsStatistics" resultType="java.util.HashMap">
         SELECT
-            SUM(CASE WHEN F_PROJECT_CATEGORY = '已通过投评项目' THEN 1 ELSE 0 END ) AS YTGTPXMS, -- 已通过投评项目
-            SUM(CASE WHEN F_PROJECT_CATEGORY = '已签约项目' THEN 1 ELSE 0 END ) AS YQYXMS, -- 已签约项目
-            ROUND(SUM(F_ANNUAL_INCOME_FORECAST/10000),2) AS YJZNSR,	-- 预计总年收入(亿元)
-            ROUND(SUM(F_ANNUAL_NET_PROFIT_FORECAST/10000),2) AS YJZNLR, -- 预计总年利润(亿元)
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已通过投评项目' THEN 1 ELSE 0 END ),0) AS YTGTPXMS, -- 已通过投评项目
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已签约项目' THEN 1 ELSE 0 END ),0) AS YQYXMS, -- 已签约项目
+            IFNULL(ROUND(SUM(F_ANNUAL_INCOME_FORECAST/10000),2),0.00) AS YJZNSR,	-- 预计总年收入(亿元)
+            IFNULL(ROUND(SUM(F_ANNUAL_NET_PROFIT_FORECAST/10000),2),0.00) AS YJZNLR, -- 预计总年利润(亿元)
 
 
             COUNT(*) AS XMZS, -- 项目总数
-            SUM(CASE WHEN F_PROJECT_CATEGORY = '暂缓项目' THEN 1 ELSE 0 END ) AS ZHXMS, -- 暂缓项目
-            SUM(CASE WHEN F_PROJECT_CATEGORY = '出库项目' THEN 1 ELSE 0 END ) AS CKXMS, -- 出库项目数
-            SUM(CASE WHEN F_PROJECT_CATEGORY = '本月重点推进项目' THEN 1 ELSE 0 END ) AS BYZDTJXMS, -- 本月重点推进项目
-            ROUND(SUM(F_INVESTMENT_SCALE/10000),2) AS YJZTZ, -- 预计总投资（亿元）
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '暂缓项目' THEN 1 ELSE 0 END ),0) AS ZHXMS, -- 暂缓项目
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '出库项目' THEN 1 ELSE 0 END ),0) AS CKXMS, -- 出库项目数
+            IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '本月重点推进项目' THEN 1 ELSE 0 END ),0) AS BYZDTJXMS, -- 本月重点推进项目
+            IFNULL(ROUND(SUM(F_INVESTMENT_SCALE/10000),2),0.00) AS YJZTZ, -- 预计总投资（亿元）
 
 
-            SUM(F_SMART_HEATING) AS ZHGR, -- 智慧供热
-            ROUND(SUM(F_ENERGY_EFFICIENCY/10000),2) AS ZHNX, -- 综合能效
-            SUM(F_PHOTOVOLTAIC) AS GF, -- 光伏
-            SUM(F_ENERGY_STORAGE) AS CN -- 储能
+            IFNULL(SUM(F_SMART_HEATING),0.00) AS ZHGR, -- 智慧供热
+            IFNULL(ROUND(SUM(F_ENERGY_EFFICIENCY/10000),2),0.00) AS ZHNX, -- 综合能效
+            IFNULL(SUM(F_PHOTOVOLTAIC),0.00) AS GF, -- 光伏
+            IFNULL(SUM(F_ENERGY_STORAGE),0.00) AS CN -- 储能
 
         FROM
             W_PROJECT_LIBRARY_INVENTORY
@@ -139,10 +139,10 @@
 
     <select id="investmentScaleStatistics" resultType="java.util.HashMap">
         SELECT
-        SUM(CASE WHEN F_investment_scale &lt;= 500 THEN 1 ELSE 0 END) AS '≤500万',
-        SUM(CASE WHEN F_investment_scale > 500 AND F_investment_scale &lt;= 1000 THEN 1 ELSE 0 END)  AS '500-1000万',
-        SUM(CASE WHEN F_investment_scale > 1000 AND F_investment_scale &lt;= 3000 THEN 1 ELSE 0 END)  AS '1000-3000万',
-        SUM(CASE WHEN F_investment_scale > 3000 THEN 1 ELSE 0 END)  AS '＞3000万'
+        IFNULL(SUM(CASE WHEN F_investment_scale &lt;= 500 THEN 1 ELSE 0 END),0.00) AS '≤500万',
+        IFNULL(SUM(CASE WHEN F_investment_scale > 500 AND F_investment_scale &lt;= 1000 THEN 1 ELSE 0 END),0.00)  AS '500-1000万',
+        IFNULL(SUM(CASE WHEN F_investment_scale > 1000 AND F_investment_scale &lt;= 3000 THEN 1 ELSE 0 END),0.00)  AS '1000-3000万',
+        IFNULL(SUM(CASE WHEN F_investment_scale > 3000 THEN 1 ELSE 0 END),0.00)  AS '＞3000万'
         FROM
         W_PROJECT_LIBRARY_INVENTORY
         WHERE
--
libgit2 0.21.2