统计修改

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

@@ -343,7 +343,6 @@
         LEFT JOIN privilege_company pc on jp.regional_companies_code = pc.ORG_CODE
         WHERE
         jp.regional_companies_code IS NOT NULL
-        AND jp.amos_company_code IS NOT NULL
         <if test="developerCode != null and developerCode != ''">
             AND jp.amos_company_code = #{developerCode}
         </if>
@@ -551,13 +550,13 @@
 
     <select id="statisticsPowerStation" resultType="map">
         SELECT
-            SUM( CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END ) AS kcwtg,
-            SUM( CASE WHEN ps.process_status = '进行中' THEN 1 ELSE 0 END ) AS kcjxz,
-            SUM( CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END ) AS kcywc,
-            SUM( CASE WHEN hc.STATUS = '未签署' THEN 1 ELSE 0 END ) AS wqs,
-            SUM( CASE WHEN hc.STATUS = '农户已签署' THEN 1 ELSE 0 END ) AS nhyqs,
-            SUM( CASE WHEN hc.STATUS = '双方已签署' THEN 1 ELSE 0 END ) AS sfyqs,
-            SUM( CASE WHEN hc.STATUS = '已作废' THEN 1 ELSE 0 END ) AS yzf
+        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 hc.STATUS = '未签署' THEN 1 ELSE 0 END ), 0 ) AS wqs,
+        IFNULL( SUM( CASE WHEN hc.STATUS = '农户已签署' THEN 1 ELSE 0 END ), 0 ) AS nhyqs,
+        IFNULL( SUM( CASE WHEN hc.STATUS = '双方已签署' THEN 1 ELSE 0 END ), 0 ) AS sfyqs,
+        IFNULL( SUM( CASE WHEN hc.STATUS = '已作废' THEN 1 ELSE 0 END ), 0 ) AS yzf
         FROM
             hygf_peasant_household ph
                 LEFT JOIN hygf_power_station ps ON ps.peasant_household_id = ph.sequence_nbr
@@ -584,10 +583,9 @@
 
     <select id="statisticsPreparationMoney" resultType="map">
         SELECT
-        SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'     THEN 1 ELSE 0 END )  AS dfh,
-        SUM( CASE WHEN  preparation_money_state = '待补货'    THEN 1 ELSE 0 END )  AS dbh,
-        SUM( CASE WHEN preparation_money_state = '备货完成'  THEN 1 ELSE 0 END )  AS ysh,
-        SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END )  AS yfh
+        IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'  or preparation_money_state = '待补货'    THEN 1 ELSE 0 END ), 0 )  AS dfh,
+        IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成'  THEN 1 ELSE 0 END ), 0 )  AS ysh,
+        IFNULL(SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END ), 0 )  AS yfh
         FROM
         hygf_peasant_household
         WHERE