ZeroLiYi 3 months ago
parent
commit
4e973ae0ee

+ 2 - 1
unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/es/mapper/mapping/EsNetworkEntryMapper.xml

@@ -71,7 +71,7 @@
71
     <select id="selectCountyCount"
71
     <select id="selectCountyCount"
72
             resultType="com.unis.emergencySupport.modular.es.entity.vo.EsNetworkEntryCountVO">
72
             resultType="com.unis.emergencySupport.modular.es.entity.vo.EsNetworkEntryCountVO">
73
         SELECT
73
         SELECT
74
-            biz_es_network_entry.management_area_county AS area,
74
+            dd.DICT_LABEL  AS area,
75
             COUNT(DISTINCT biz_es_network_entry.id) AS enterpriseCount,
75
             COUNT(DISTINCT biz_es_network_entry.id) AS enterpriseCount,
76
             SUM(CASE WHEN biz_es_network_entry_grain.grain_variety = 1 THEN biz_es_network_entry_grain.quantity ELSE 0 END) AS wheatQuantity,
76
             SUM(CASE WHEN biz_es_network_entry_grain.grain_variety = 1 THEN biz_es_network_entry_grain.quantity ELSE 0 END) AS wheatQuantity,
77
             SUM(CASE WHEN biz_es_network_entry_grain.grain_variety = 2 THEN biz_es_network_entry_grain.quantity ELSE 0 END) AS riceQuantity,
77
             SUM(CASE WHEN biz_es_network_entry_grain.grain_variety = 2 THEN biz_es_network_entry_grain.quantity ELSE 0 END) AS riceQuantity,
@@ -81,6 +81,7 @@
81
             biz_es_network_entry
81
             biz_es_network_entry
82
                 LEFT JOIN
82
                 LEFT JOIN
83
             biz_es_network_entry_grain ON biz_es_network_entry.id = biz_es_network_entry_grain.es_network_entry_id
83
             biz_es_network_entry_grain ON biz_es_network_entry.id = biz_es_network_entry_grain.es_network_entry_id
84
+        left join dev_dict dd on biz_es_network_entry.management_area_county=dd.id
84
         where 1=1
85
         where 1=1
85
         <if test="esNetworkEntryCountParam.managementAreaCity!=null and esNetworkEntryCountParam.managementAreaCity!=''">
86
         <if test="esNetworkEntryCountParam.managementAreaCity!=null and esNetworkEntryCountParam.managementAreaCity!=''">
86
             and
87
             and