|
@@ -71,7 +71,7 @@
|
71
|
71
|
<select id="selectCountyCount"
|
72
|
72
|
resultType="com.unis.emergencySupport.modular.es.entity.vo.EsNetworkEntryCountVO">
|
73
|
73
|
SELECT
|
74
|
|
- biz_es_network_entry.management_area_county AS area,
|
|
74
|
+ dd.DICT_LABEL AS area,
|
75
|
75
|
COUNT(DISTINCT biz_es_network_entry.id) AS enterpriseCount,
|
76
|
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
|
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
|
81
|
biz_es_network_entry
|
82
|
82
|
LEFT JOIN
|
83
|
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
|
85
|
where 1=1
|
85
|
86
|
<if test="esNetworkEntryCountParam.managementAreaCity!=null and esNetworkEntryCountParam.managementAreaCity!=''">
|
86
|
87
|
and
|