Commit 5c0482249e21dbefc9604b5437bad997aeb40570
1 parent
cfb74d22
Exists in
master
开发：项目汇总表
Showing
3 changed files
with
26 additions
and
19 deletions
Show diff stats
backend/chkpower/src/main/java/com/hotent/chkpower/dao/WProjectLibraryInventoryDao.java
| ... | ... | @@ -41,7 +41,7 @@ public interface WProjectLibraryInventoryDao extends BaseMapper<WProjectLibraryI |
| 41 | 41 | * @param orgIdList |
| 42 | 42 | * @return |
| 43 | 43 | */ |
| 44 | - List<HashMap<String, Object>> investmentScaleStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("list")ArrayList<String> orgIdList); | |
| 44 | + HashMap<String, Object> investmentScaleStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("list")ArrayList<String> orgIdList); | |
| 45 | 45 | |
| 46 | 46 | /** |
| 47 | 47 | * 项目主体项目占比 | ... | ... |
backend/chkpower/src/main/java/com/hotent/chkpower/manager/impl/WProjectLibraryInventoryManagerImpl.java
| ... | ... | @@ -51,8 +51,15 @@ public class WProjectLibraryInventoryManagerImpl extends BaseManagerImpl<WProjec |
| 51 | 51 | List<String> xmpjList = baseMapper.listDictByKey("xmpj"); |
| 52 | 52 | List<HashMap<String, Object>> xmzlMap = baseMapper.projectRatingStatistics(startDate, endDate, orgIdList, xmpjList); |
| 53 | 53 | map.put("XMZL", xmzlMap); |
| 54 | - List<HashMap<String, Object>> tzgmMap = baseMapper.investmentScaleStatistics(startDate, endDate, orgIdList); | |
| 55 | - map.put("TZGM", tzgmMap); | |
| 54 | + HashMap<String, Object> tzgmMap = baseMapper.investmentScaleStatistics(startDate, endDate, orgIdList); | |
| 55 | + ArrayList<HashMap> tzgmList = new ArrayList<>(); | |
| 56 | + for (String key : tzgmMap.keySet()) { | |
| 57 | + HashMap<String, Object> tzgm = new HashMap<>(); | |
| 58 | + tzgm.put("name", key); | |
| 59 | + tzgm.put("value", tzgmMap.get(key)); | |
| 60 | + tzgmList.add(tzgm); | |
| 61 | + } | |
| 62 | + map.put("TZGM", tzgmList); | |
| 56 | 63 | |
| 57 | 64 | List<HashMap<String, Object>> xmztxmzbMap = baseMapper.orgNameProjectStatistics(startDate, endDate, orgIdList); |
| 58 | 65 | map.put("XMZTXMZB", xmztxmzbMap); | ... | ... |
backend/chkpower/src/main/resources/mapper/WProjectLibraryInventoryMapper.xml
| ... | ... | @@ -81,23 +81,23 @@ |
| 81 | 81 | |
| 82 | 82 | <select id="basicsStatistics" resultType="java.util.HashMap"> |
| 83 | 83 | SELECT |
| 84 | - SUM(CASE WHEN F_PROJECT_CATEGORY = '已通过投评项目' THEN 1 ELSE 0 END ) AS YTGTPXMS, -- 已通过投评项目 | |
| 85 | - SUM(CASE WHEN F_PROJECT_CATEGORY = '已签约项目' THEN 1 ELSE 0 END ) AS YQYXMS, -- 已签约项目 | |
| 86 | - ROUND(SUM(F_ANNUAL_INCOME_FORECAST/10000),2) AS YJZNSR, -- 预计总年收入(亿元) | |
| 87 | - ROUND(SUM(F_ANNUAL_NET_PROFIT_FORECAST/10000),2) AS YJZNLR, -- 预计总年利润(亿元) | |
| 84 | + IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已通过投评项目' THEN 1 ELSE 0 END ),0) AS YTGTPXMS, -- 已通过投评项目 | |
| 85 | + IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '已签约项目' THEN 1 ELSE 0 END ),0) AS YQYXMS, -- 已签约项目 | |
| 86 | + IFNULL(ROUND(SUM(F_ANNUAL_INCOME_FORECAST/10000),2),0.00) AS YJZNSR, -- 预计总年收入(亿元) | |
| 87 | + IFNULL(ROUND(SUM(F_ANNUAL_NET_PROFIT_FORECAST/10000),2),0.00) AS YJZNLR, -- 预计总年利润(亿元) | |
| 88 | 88 | |
| 89 | 89 | |
| 90 | 90 | COUNT(*) AS XMZS, -- 项目总数 |
| 91 | - SUM(CASE WHEN F_PROJECT_CATEGORY = '暂缓项目' THEN 1 ELSE 0 END ) AS ZHXMS, -- 暂缓项目 | |
| 92 | - SUM(CASE WHEN F_PROJECT_CATEGORY = '出库项目' THEN 1 ELSE 0 END ) AS CKXMS, -- 出库项目数 | |
| 93 | - SUM(CASE WHEN F_PROJECT_CATEGORY = '本月重点推进项目' THEN 1 ELSE 0 END ) AS BYZDTJXMS, -- 本月重点推进项目 | |
| 94 | - ROUND(SUM(F_INVESTMENT_SCALE/10000),2) AS YJZTZ, -- 预计总投资（亿元） | |
| 91 | + IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '暂缓项目' THEN 1 ELSE 0 END ),0) AS ZHXMS, -- 暂缓项目 | |
| 92 | + IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '出库项目' THEN 1 ELSE 0 END ),0) AS CKXMS, -- 出库项目数 | |
| 93 | + IFNULL(SUM(CASE WHEN F_PROJECT_CATEGORY = '本月重点推进项目' THEN 1 ELSE 0 END ),0) AS BYZDTJXMS, -- 本月重点推进项目 | |
| 94 | + IFNULL(ROUND(SUM(F_INVESTMENT_SCALE/10000),2),0.00) AS YJZTZ, -- 预计总投资（亿元） | |
| 95 | 95 | |
| 96 | 96 | |
| 97 | - SUM(F_SMART_HEATING) AS ZHGR, -- 智慧供热 | |
| 98 | - ROUND(SUM(F_ENERGY_EFFICIENCY/10000),2) AS ZHNX, -- 综合能效 | |
| 99 | - SUM(F_PHOTOVOLTAIC) AS GF, -- 光伏 | |
| 100 | - SUM(F_ENERGY_STORAGE) AS CN -- 储能 | |
| 97 | + IFNULL(SUM(F_SMART_HEATING),0.00) AS ZHGR, -- 智慧供热 | |
| 98 | + IFNULL(ROUND(SUM(F_ENERGY_EFFICIENCY/10000),2),0.00) AS ZHNX, -- 综合能效 | |
| 99 | + IFNULL(SUM(F_PHOTOVOLTAIC),0.00) AS GF, -- 光伏 | |
| 100 | + IFNULL(SUM(F_ENERGY_STORAGE),0.00) AS CN -- 储能 | |
| 101 | 101 | |
| 102 | 102 | FROM |
| 103 | 103 | W_PROJECT_LIBRARY_INVENTORY |
| ... | ... | @@ -139,10 +139,10 @@ |
| 139 | 139 | |
| 140 | 140 | <select id="investmentScaleStatistics" resultType="java.util.HashMap"> |
| 141 | 141 | SELECT |
| 142 | - SUM(CASE WHEN F_investment_scale <= 500 THEN 1 ELSE 0 END) AS '≤500万', | |
| 143 | - SUM(CASE WHEN F_investment_scale > 500 AND F_investment_scale <= 1000 THEN 1 ELSE 0 END) AS '500-1000万', | |
| 144 | - SUM(CASE WHEN F_investment_scale > 1000 AND F_investment_scale <= 3000 THEN 1 ELSE 0 END) AS '1000-3000万', | |
| 145 | - SUM(CASE WHEN F_investment_scale > 3000 THEN 1 ELSE 0 END) AS '＞3000万' | |
| 142 | + IFNULL(SUM(CASE WHEN F_investment_scale <= 500 THEN 1 ELSE 0 END),0.00) AS '≤500万', | |
| 143 | + IFNULL(SUM(CASE WHEN F_investment_scale > 500 AND F_investment_scale <= 1000 THEN 1 ELSE 0 END),0.00) AS '500-1000万', | |
| 144 | + IFNULL(SUM(CASE WHEN F_investment_scale > 1000 AND F_investment_scale <= 3000 THEN 1 ELSE 0 END),0.00) AS '1000-3000万', | |
| 145 | + IFNULL(SUM(CASE WHEN F_investment_scale > 3000 THEN 1 ELSE 0 END),0.00) AS '＞3000万' | |
| 146 | 146 | FROM |
| 147 | 147 | W_PROJECT_LIBRARY_INVENTORY |
| 148 | 148 | WHERE | ... | ... |