统计bug修改

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

@@ -607,9 +607,13 @@
         SELECT
         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 ei.real_scale ELSE 0 END ), 0 )  AS yshrl,
         IFNULL(SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END ), 0 )  AS yfh
+
         FROM
         hygf_peasant_household
+        LEFT JOIN hygf_work_order_power_station wops ON wops.peasant_household_id = hygf_peasant_household.sequence_nbr
+        LEFT JOIN hygf_power_station_engineering_info ei ON ei.work_order_power_station_id = wops.sequence_nbr
         WHERE
         preparation_money_state IS NOT NULL
         <if test="developerCode != null and developerCode != ''">

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -563,11 +563,13 @@ public class StatisticsHomepageServiceImpl {
                  }
                  break;
              case "preparationMoney":
-
                  Map<String, Object> preparationMoney = statisticsHomepageMapper.statisticsPreparationMoney(developerCode, regionalCompaniesCode, province, city, district);
                  for (String key : preparationMoney.keySet()) {
-                     resultMap.put(key,Arrays.asList(preparationMoney.get(key),"0"));
+                     if (!key.contains("rl")){
+                         resultMap.put(key,Arrays.asList(preparationMoney.get(key),"0"));
+                     }
                  }
+                 resultMap.put("ysh",Arrays.asList(preparationMoney.get("ysh"),new BigDecimal((double)preparationMoney.get("yshrl")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
                  break;
             case "workOrder":
                 List<Map<String, Object>> workOrderMaps = statisticsHomepageMapper.workOrderTotal(developerCode, regionalCompaniesCode, province, city, district);