Merge remote-tracking branch 'remotes/origin/dev-2.7.0' into dev

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,@RequestParam(value = "sfqy",required = false) String sfqy) {
-        return CommonResult.data(bizEsStorageEnterpriseService.statistics(city,sfqy));
+    public CommonResult<List<Map<String,Object>>> statistics(@RequestParam(value = "city",required = false) String city,@RequestParam(value = "county",required = false) String county) {
+        return CommonResult.data(bizEsStorageEnterpriseService.statistics(city,county));
     }
 
 }

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

@@ -53,5 +53,5 @@ public interface BizEsStorageEnterpriseMapper extends BaseMapper<BizEsStorageEnt
 
     List<Map<String, Object>> getSlByCounty(@Param("city") String city);
 
-    List<Map<String, Object>> getQyDataByCounty(@Param("city") String city);
+    List<Map<String, Object>> getQyDataByCounty(@Param("county") String county);
 }

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

@@ -271,7 +271,7 @@
                          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}
+                   and a.management_area_county = #{county}
              )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,String sfqy);
+    List<Map<String,Object>> statistics(String city,String county);
 }

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

@@ -1010,7 +1010,7 @@ public class BizEsStorageEnterpriseServiceImpl extends ServiceImpl<BizEsStorageE
     }
 
     @Override
-    public List<Map<String, Object>> statistics(String city,String sfqy) {
+    public List<Map<String, Object>> statistics(String city,String county) {
 
         List<Map<String, Object>> provinceList = new ArrayList<Map<String, Object>>();
         List<Map<String, Object>> cityList = new ArrayList<Map<String, Object>>();
@@ -1018,9 +1018,9 @@ public class BizEsStorageEnterpriseServiceImpl extends ServiceImpl<BizEsStorageE
         List<Map<String, Object>> qyList = new ArrayList<Map<String, Object>>();
 
         if( null != city &&   "" != city){
-                if(null != sfqy &&   "" != sfqy){
+                if(null != county &&   "" != county){
                     //企业
-                    qyList = bizEsStorageEnterpriseMapper.getQyDataByCounty(city);
+                    qyList = bizEsStorageEnterpriseMapper.getQyDataByCounty(county);
                 }else{
                     //县
                     countyList = bizEsStorageEnterpriseMapper.getDataByCounty(city);