拆分已发货

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

@@ -833,8 +833,8 @@
 </select>
 
     <select id="queryCompany" resultType="java.util.Map">
-        SELECT privilege_company.ORG_CODE   value,
-        privilege_company.COMPANY_NAME name
+        SELECT privilege_company.ORG_CODE,
+        privilege_company.COMPANY_NAME
         FROM privilege_company
         WHERE IS_DELETED = 0
         <if test="companyType!=null and companyType != ''">

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

@@ -118,9 +118,12 @@
     <select id="preparationMoneyTotal" resultType="map">
         SELECT
         SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货'     THEN 1 ELSE 0 END )  AS '待发货',
-        SUM( CASE WHEN preparation_money_state = '备货完成' or  preparation_money_state = '已收货'   THEN 1 ELSE 0 END )  AS '已收货',
-        ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '备货完成' or  preparation_money_state = '已收货'   THEN ei.real_scale ELSE 0 END ), 0), 2)  AS yshrl,
-        SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END )  AS '已发货'
+        SUM( CASE WHEN   preparation_money_state = '已收货'   THEN 1 ELSE 0 END )  AS '已收货',
+        ROUND(COALESCE(SUM( CASE WHEN  preparation_money_state = '已收货'   THEN ei.real_scale ELSE 0 END ), 0), 2)  AS yshrl,
+        SUM( CASE WHEN preparation_money_state = '待收货'  THEN 1 ELSE 0 END )  AS '已发货',
+        SUM( CASE WHEN preparation_money_state = '备货完成'    THEN 1 ELSE 0 END )  AS '备货完成',
+        ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '备货完成'    THEN ei.real_scale ELSE 0 END ), 0), 2)  AS bhwcrl
+
         FROM
         hygf_peasant_household
         LEFT JOIN hygf_work_order_power_station ps ON ps.peasant_household_id = hygf_peasant_household.sequence_nbr

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

@@ -677,8 +677,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
         List<Map<String, String>> maps = jpStationMapper.queryCompany(null);
         if(CollectionUtil.isNotEmpty(maps)){
             for (Map<String, String> stringStringMap : maps) {
-                String orgCode = stringStringMap.get("value");
-                String companyName = stringStringMap.get("name");
+                String orgCode = stringStringMap.get("ORG_CODE");
+                String companyName = stringStringMap.get("COMPANY_NAME");
                 map.put(orgCode,companyName);
             }
         }
@@ -1107,7 +1107,18 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
     }
 
     public List<Map<String, String>> queryCompany(String companyType) {
-        return jpStationMapper.queryCompany(companyType);
+        List<Map<String, String>> maps = jpStationMapper.queryCompany(companyType);
+        List<Map<String, String>> result=new ArrayList<>();
+        if(CollectionUtil.isNotEmpty(maps)){
+            for (Map<String, String> map : maps) {
+                Map<String, String> newMap = new HashMap<>();
+                String orgCode = map.get("ORG_CODE");
+                String companyName = map.get("COMPANY_NAME");
+                newMap.put(orgCode,companyName);
+                result.add(newMap);
+            }
+        }
+        return result;
     }
 
     public JpStationDto getStationDetail(Long sequenceNbr) {

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

@@ -186,15 +186,16 @@ public class StatisticsHomepageServiceImpl {
                     Map<String, Object> preparationMoney = maps.get(0);
                     preparationMoneyKeys.removeAll(preparationMoney.keySet());
                     for (String e : preparationMoney.keySet()) {
-                        if (!e.equals("已收货") &&!e.equals("yshrl")){
+                        if (!e.equals("已收货") &&!e.equals("yshrl") && !e.equals("备货完成") &&!e.equals("bhwcrl")){
                             list.add(MapBuilder.<String, Object>create().put("statusText", e).put("total", preparationMoney.get(e)).build());
                             preparationNum += new BigDecimal(preparationMoney.get(e).toString()).longValue();
                         }
-                        if (e.equals("已收货")){
+                        if (e.equals("已收货") || e.equals("备货完成")){
                             preparationNum += new BigDecimal(preparationMoney.get(e).toString()).longValue();
                         }
                     }
                     list.add(MapBuilder.<String, Object>create().put("statusText", "已收货").put("total", preparationMoney.get("已收货")).put("realScale", preparationMoney.get("yshrl")).build());
+                    list.add(MapBuilder.<String, Object>create().put("statusText", "备货完成").put("total", preparationMoney.get("备货完成")).put("realScale", preparationMoney.get("bhwcrl")).build());
                     list =    this.nullDataBuildResult(list,preparationMoneyKeys);
                 }
                 resultMap.put("preparationMoney",list);