统计bug修改 增加导出及统计条 勘察完成 备货完成 双方已签署 容量

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -390,9 +390,9 @@
         SUM(CASE WHEN ps.process_status = '进行中' THEN 1 ELSE 0 END) AS kcjxz,
         '' AS kcjxzrl,
         SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc,
-        SUM(CASE WHEN ps.process_status = '完成' THEN  ROUND(COALESCE(ei.real_scale/1000, 0), 2) ELSE 0 END) AS kcywcrl,
+        ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2)  AS kcywcrl,
         SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN 1 ELSE 0 END) AS bhywc,
-        SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN  ROUND(COALESCE(ei.real_scale/1000, 0), 2) AS bhywcrl,
+        ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
         SUM(CASE WHEN ph.preparation_money_state = '待发货' or ph.preparation_money_state = '暂存发货'or ph.preparation_money_state = '待补货'     THEN 1 ELSE 0 END )  AS bhwtg,
         '' AS bhjxzrl,
         SUM(CASE WHEN ph.preparation_money_state = '待收货' THEN 1 ELSE 0 END) AS bhjxz,
@@ -569,8 +569,8 @@
         IFNULL( sum( CASE WHEN lc.STATUS = '未签署' THEN 1 ELSE 0 END ), 0 ) wqs,
         IFNULL( SUM( CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END ), 0 ) AS kcwtg,
         IFNULL( SUM( CASE WHEN ps.process_status = '进行中' THEN 1 ELSE 0 END ), 0 ) AS kcjxz,
-        IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END ), 0 ) AS kcywc
-        IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS kcywc
+        IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END ), 0 ) AS kcywc,
+        IFNULL( SUM( CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS kcywcrl
         FROM
         hygf_power_station ps
         LEFT JOIN (