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

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelCityController.java

@@ -69,7 +69,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<Map<String, Object>> analysisLawUnion(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         Map<String, Object> resMap = statisticalPaneCityService.collectStatistics(params);
         return R.ok("联合检查", resMap);
     }
@@ -80,7 +79,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<List<Map<String, String>>> queryEnfEntSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneCityService.queryEnfEntSort(params);
         return R.ok("被执法企业次数排行", resMap);
     }
@@ -91,7 +89,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<List<Map<String, String>>> queryEnforcementSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneCityService.queryEnforcementSort(params);
         return R.ok("执法单位执法数量排行", resMap);
     }
@@ -102,7 +99,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<List<Map<String, String>>> queryEntCSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneCityService.queryEntCSort(params);
         return R.ok("被投诉单位次数排行", resMap);
     }
@@ -113,7 +109,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<Map<String, Long>> queryAutoRate(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         Map<String, Long> resMap = statisticalPaneCityService.queryAutoRate(params);
         return R.ok("委托执法数量及占比", resMap);
     }
@@ -124,7 +119,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<List<Map<String, String>>> queryUnionSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneCityService.queryEnfEntSort(params);
         return R.ok("被执法企业次数排行", resMap);
     }
@@ -135,7 +129,6 @@ public class StatisticalPanelCityController {
     @ResponseBody
     public R<List<Map<String, String>>> queryLawEntSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneCityService.queryEnforcementSort(params);
         return R.ok("执法单位执法数量排行", resMap);
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/StatisticalPanelDistrictController.java

@@ -68,7 +68,6 @@ public class StatisticalPanelDistrictController  {
     @ResponseBody
     public R<Map<String, Object>> analysisLawUnion(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         Map<String, Object> resMap = statisticalPaneDistrictService.collectStatistics(params);
         return R.ok("联合检查", resMap);
     }
@@ -79,7 +78,6 @@ public class StatisticalPanelDistrictController  {
     @ResponseBody
     public R<List<Map<String, String>>> queryEnfEntSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneDistrictService.queryEnfEntSort(params);
         return R.ok("被执法企业次数排行", resMap);
     }
@@ -90,7 +88,6 @@ public class StatisticalPanelDistrictController  {
     @ResponseBody
     public R<List<Map<String, String>>> queryEnforcementSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneDistrictService.queryEnforcementSort(params);
         return R.ok("执法单位执法数量排行", resMap);
     }
@@ -101,7 +98,6 @@ public class StatisticalPanelDistrictController  {
     @ResponseBody
     public R<List<Map<String, String>>> queryEntCSort(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         List<Map<String, String>> resMap = statisticalPaneDistrictService.queryEntCSort(params);
         return R.ok("被投诉单位次数排行", resMap);
     }
@@ -112,7 +108,6 @@ public class StatisticalPanelDistrictController  {
     @ResponseBody
     public  R<Map<String, Long>> queryAutoRate(@RequestBody SixAnalysisParamsBo params){
         // 全市行政检查数量
-        params.setDeptId(params.getBureauDeptId());
         Map<String, Long> resMap = statisticalPaneDistrictService.queryAutoRate(params);
         return R.ok("委托执法数量及占比", resMap);
     }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/StatisticalPaneServiceCityImpl.java

@@ -55,8 +55,6 @@ public class StatisticalPaneServiceCityImpl implements IStatisticalPaneCityServi
         }
         if (deptIds.size() > 0) params.setFilterDepts(deptIds);
 
-//        params.setZone(1);
-//        List<EnforcementRegistration> allLawRegs = statisticalPanelCityMapper.query_law_all(params);
         List<EnforcementRegistrationVo> allLawRegs = this.queryLawAll(params);
 
         Map<String, Double> singleLaw = new HashMap<>();
@@ -208,8 +206,6 @@ public class StatisticalPaneServiceCityImpl implements IStatisticalPaneCityServi
         double rate = (double)(unionAllNum - duplicateUnionNos.size()) / allLawRegs.size() * 100;
         entEeduction.put("rate", Double.isNaN(rate)?0:rate);
 
-        // 涉企投诉量
-//        List<EnterpriseComplaint> complaints = statisticalPanelCityMapper.query_complaint_all(params);
         // 权限要单独写
         List<EnterpriseComplaintVo> complaints = this.queryComplaintAll(params);
         entComplaint.put("count", Double.valueOf(complaints.size()));