增加sql

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/esstorageenterprise/controller/BizEsStorageEnterpriseController.java

@@ -177,8 +177,8 @@ public class BizEsStorageEnterpriseController {
     @ApiOperationSupport(order = 8)
     @ApiOperation("*应急仓储企业统计")
     @GetMapping("/emergencySupport/supportCenter/statistics")
-    public CommonResult<List<Map<String,Object>>> statistics(@RequestParam(value = "city",required = false) String city) {
-        return CommonResult.data(bizEsStorageEnterpriseService.statistics(city));
+    public CommonResult<List<Map<String,Object>>> statistics(@RequestParam(value = "city",required = false) String city,@RequestParam(value = "sfqy",required = false) String sfqy) {
+        return CommonResult.data(bizEsStorageEnterpriseService.statistics(city,sfqy));
     }
 
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/esstorageenterprise/mapper/BizEsStorageEnterpriseMapper.java

@@ -52,4 +52,6 @@ public interface BizEsStorageEnterpriseMapper extends BaseMapper<BizEsStorageEnt
     List<Map<String, Object>> getDataByCounty(@Param("city") String city);
 
     List<Map<String, Object>> getSlByCounty(@Param("city") String city);
+
+    List<Map<String, Object>> getQyDataByCounty(@Param("city") String city);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/esstorageenterprise/mapper/mapping/BizEsStorageEnterpriseMapper.xml

@@ -245,4 +245,33 @@
             </if>
         GROUP BY management_area_county
     </select>
+
+    <select id="getQyDataByCounty" resultType="java.util.Map" parameterType="java.lang.String">
+        select
+            management_area_province province,
+            management_area_city city,
+            management_area_county county,
+            dqmc dqmc,
+            qymc qymc,
+            sum(case grain_variety when '1' then quantity else 0 end) as 'xmylrkc',
+            sum(case grain_variety when '5' then quantity else 0 end) as 'qtylrkc',
+            sum(case grain_variety when '7' then quantity else 0 end) as 'dmcplrkc',
+            sum(case grain_variety when '8' then quantity else 0 end) as 'syycplrkc'
+        from (
+                 SELECT
+                     a.management_area_province,
+                     a.management_area_city,
+                     a.management_area_county,
+                     c.DICT_LABEL dqmc,
+                     b.grain_variety,
+                     b.quantity,
+                     a.enterprise_name qymc
+                 FROM
+                     biz_es_storage_enterprise a
+                         LEFT JOIN biz_es_storage_enterprise_grain b on a.id = b.es_storage_enterprise_id
+                         LEFT JOIN dev_dict c on a.management_area_county = c.id
+                 where 1=1
+                   and a.management_area_city = #{city}
+             )c GROUP BY qymc
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/esstorageenterprise/service/BizEsStorageEnterpriseService.java

@@ -86,5 +86,5 @@ public interface BizEsStorageEnterpriseService extends IService<BizEsStorageEnte
 
     List<Map<String,Object>> getAllList(String type);
 
-    List<Map<String,Object>> statistics(String city);
+    List<Map<String,Object>> statistics(String city,String sfqy);
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/emergencySupport/modular/esstorageenterprise/service/impl/BizEsStorageEnterpriseServiceImpl.java

@@ -1010,21 +1010,28 @@ public class BizEsStorageEnterpriseServiceImpl extends ServiceImpl<BizEsStorageE
     }
 
     @Override
-    public List<Map<String, Object>> statistics(String city) {
+    public List<Map<String, Object>> statistics(String city,String sfqy) {
 
         List<Map<String, Object>> provinceList = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> cityList = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> countyList = new ArrayList<Map<String, Object>>();
-            if( null != city &&   "" != city){
-                //县
-                 countyList = bizEsStorageEnterpriseMapper.getDataByCounty(city);
-                List<Map<String, Object>> countyCount= bizEsStorageEnterpriseMapper.getSlByCounty(city);
-                for(Map<String, Object> map:countyList){
-                    for(Map<String, Object> map1:countyCount){
-                        if(map.get("county").equals(map1.get("county"))){
-                            map.put("wdsl",map1.get("wdsl"));
+        List<Map<String, Object>> qyList = new ArrayList<Map<String, Object>>();
+
+        if( null != city &&   "" != city){
+                if(null != sfqy &&   "" != sfqy){
+                    //县
+                    countyList = bizEsStorageEnterpriseMapper.getDataByCounty(city);
+                    List<Map<String, Object>> countyCount= bizEsStorageEnterpriseMapper.getSlByCounty(city);
+                    for(Map<String, Object> map:countyList){
+                        for(Map<String, Object> map1:countyCount){
+                            if(map.get("county").equals(map1.get("county"))){
+                                map.put("wdsl",map1.get("wdsl"));
+                            }
                         }
                     }
+                }else{
+                    //企业
+                    qyList = bizEsStorageEnterpriseMapper.getQyDataByCounty(city);
                 }
             }else{