环保大数据统计

src/main/java/com/sooka/sponest/data/digitalenvironment/controller/EnvironmentBigDataController.java

@@ -168,7 +168,7 @@ public class EnvironmentBigDataController extends BaseController {
     @ApiOperation(value = "大数据查询秸秆离田" , notes = "大数据查询秸秆离田")
     @GetMapping("/leaveField")
     public R leaveField(EnvironmentBigDataVo environmentBigDataVo) {
-        return R.ok(environmentBigDataService.leaveField(environmentBigDataVo));
+        return environmentBigDataService.leaveField(environmentBigDataVo);
     }
     
     /*

src/main/java/com/sooka/sponest/data/digitalenvironment/service/impl/EnvironmentBigDataServiceImpl.java

@@ -196,7 +196,7 @@ public class EnvironmentBigDataServiceImpl extends BaseServiceImpl implements IE
             case "1"://一级分类
                 mapList = centerdataTEnvironmentBigDataMapper.sewageoutletByOneclassification(environmentBigDataVo);
                 break;
-            case "2"://一级分类
+            case "2"://二级分类
                 mapList = centerdataTEnvironmentBigDataMapper.sewageoutletByTwoclassification(environmentBigDataVo);
                 break;
         }

src/main/java/com/sooka/sponest/data/utils/DeptLevelUtil.java

@@ -33,18 +33,21 @@ public class DeptLevelUtil {
             Map<String,Object> map = new HashMap<>();
             //map中增加key
             for (String key : list.get(0).keySet()) {
-                if (!key.equals("ancestors")&&!key.equals("deptId")){
+                if (!key.equals("ancestors")&&!key.equals("deptId")&&!key.equals("name")){
                     map.put(key,0);
                 }
             }
             for (Map<String,Object> ancestors : list){//资源数据
                 if (ancestors.get("ancestors").toString().concat(",").concat(ancestors.get("deptId").toString()).contains(sysDept.getAncestors().concat(",").concat(sysDept.getDeptId().toString()))){
                     for (String key : ancestors.keySet()) {
-                        if (!key.equals("ancestors")&&!key.equals("deptId")){
+                        if (!key.equals("ancestors")&&!key.equals("deptId")&&!key.equals("name")){
                             map.put(key,Long.parseLong(map.get(key).toString())+Long.parseLong(ancestors.get(key).toString()));
                         }
                     }
                 }
+                if (ancestors.containsKey("name")){
+                    map.put("name",ancestors.get("name"));
+                }
             }
             map.put("deptId",sysDept.getDeptId());
             map.put("deptName",sysDept.getDeptName());

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentBigDataMapper.xml

@@ -429,7 +429,7 @@
     </select>
 
     <select id="sewageoutletByType" resultType="java.util.Map">
-        SELECT a.dict_label,count(b.id) FROM ${database_system}.sys_dict_data a  left join
+        SELECT a.dict_label name,count(b.id) num FROM ${database_system}.sys_dict_data a  left join
         (SELECT a.id,a.type FROM centerdata_t_environment_sewage_outlet a
         left JOIN ${database_system}.sys_dept d on a.dept_id = d.dept_id where 1=1 ${params.dataScope} ) b on a.dict_value = b.type
         where a.dict_type ='centerdata_sewage_type'
@@ -437,7 +437,7 @@
     </select>
 
     <select id="sewageoutletByOneclassification" resultType="java.util.Map">
-        SELECT a.dict_label,count(b.id) FROM ${database_system}.sys_dict_data a  left join
+        SELECT a.dict_label name,count(b.id) num FROM ${database_system}.sys_dict_data a  left join
         (SELECT a.id,a.sewage_one_classification FROM centerdata_t_environment_sewage_outlet a
         left JOIN ${database_system}.sys_dept d on a.dept_id = d.dept_id where 1=1 ${params.dataScope} ) b on a.dict_value = b.sewage_one_classification
         where a.dict_type ='centerdata_sewage_oneclassification'
@@ -445,7 +445,7 @@
     </select>
 
     <select id="sewageoutletByTwoclassification" resultType="java.util.Map">
-        SELECT a.dict_label,count(b.id) FROM ${database_system}.sys_dict_data a  left join
+        SELECT a.dict_label name,count(b.id) num FROM ${database_system}.sys_dict_data a  left join
         (SELECT a.id,a.sewage_two_classification FROM centerdata_t_environment_sewage_outlet a
         left JOIN ${database_system}.sys_dept d on a.dept_id = d.dept_id where 1=1 ${params.dataScope}) b on a.dict_value = b.sewage_two_classification
         where a.dict_type ='centerdata_sewage_twoclassification'