修改监管单位统计接口

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/SupervisoryEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum SupervisoryEnum {
+
+        /**
+         * 监管单位层级
+         */
+        // 省
+        PROVINCE("headquarter","prefecture-level"),
+        // 市
+        CITY("prefecture-level", "county"),
+        // 区县
+        DISTRICT("county", "organization"),
+        // 所
+        PLACE("organization", "organization");
+
+        String level;
+        String nextLevel;
+
+        public static SupervisoryEnum getEnumByLevel(String level) {
+            for (SupervisoryEnum value : SupervisoryEnum.values()) {
+                if (value.getLevel().equals(level)) {
+                    return value;
+                }
+            }
+            return null;
+        }
+    }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsTwoStaffingService.java

@@ -19,6 +19,6 @@ import java.util.List;
  */
 public interface ITzsTwoStaffingService {
 
-    List<TzsTwoStaffing>  getStatisticsMessage(List<LinkedHashMap> list, String type, String level);
+    List<TzsTwoStaffing>  getStatisticsMessage(List<LinkedHashMap> list, String type);
     Page<TzsTwoStaffingCompanyDto> getCompanyList(String orgCode, TzsTwoStaffingCompanyDto companyDto,Page<TzsTwoStaffingCompanyDto> page);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsTwoStaffingMapper.xml

@@ -38,7 +38,7 @@
             and unit_type = #{type}
         </if>
         <if test="level != '' and level != null">
-            and supervisory_unit_level = #{type}
+            and supervisory_unit_level = #{level}
         </if>
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsTwoStaffingController.java

@@ -74,12 +74,11 @@ public class TzsTwoStaffingController extends BaseController {
     @GetMapping(value = "/getStatisticsMessage")
     @ApiOperation(httpMethod = "GET", value = "监管单位统计信息", notes = "监管单位统计信息")
     public ResponseModel<Object> getGroupAndPersonInfo(@RequestParam("sequenceNbr") String sequenceNbr,
-                                                       @RequestParam("type") String type,
-                                                       @RequestParam("level") String level) {
+                                                       @RequestParam("type") String type) {
         List<LinkedHashMap> data = (List<LinkedHashMap>) redisUtils.get(REGULATOR_UNIT_TREE);
         ArrayList<LinkedHashMap> result = new ArrayList<>();
         List<LinkedHashMap> list = tzsUserInfoServiceImpl.screenData(result, data, sequenceNbr);
-        return ResponseHelper.buildResponse(tzsTwoStaffingService.getStatisticsMessage(list, type, level));
+        return ResponseHelper.buildResponse(tzsTwoStaffingService.getStatisticsMessage(list, type));
     }
 
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsTwoStaffingServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
+import com.yeejoin.amos.boot.module.tcm.api.enums.SupervisoryEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsTwoStaffingMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsTwoStaffingService;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingDto;
@@ -46,41 +47,16 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
     }
 
     @Override
-    public List<TzsTwoStaffing> getStatisticsMessage(List<LinkedHashMap> list, String type, String level) {
-//        ArrayList<TzsTwoStaffing> tzsTwoStaffings = new ArrayList<>();
-//        List<LinkedHashMap> supervisory = treeToList(new ArrayList<>(), list);
-//        for (LinkedHashMap map : supervisory) {
-//            TzsTwoStaffing tzsTwoStaffing = new TzsTwoStaffing();
-//            tzsTwoStaffing.setSupervisoryUnitId(String.valueOf(map.get("sequenceNbr")));
-//            tzsTwoStaffing.setSupervisoryUnitName(String.valueOf(map.get("companyName")));
-//            tzsTwoStaffing.setSupervisoryUnitOrgcode(String.valueOf(map.get("orgCode")));
-//            List<TzsTwoStaffing> listByOrgCode = this.getBaseMapper().getListByOrgCode(String.valueOf(list.get(0).get("orgCode")), type, level);
-//            tzsTwoStaffing.setNumberOfUnits(listByOrgCode.size());
-//            if (!ObjectUtils.isEmpty(listByOrgCode)){
-//                listByOrgCode.stream().forEach(item ->{
-//                    tzsTwoStaffing.setNumberOfCompletedUnits(tzsTwoStaffing.getNumberOfCompletedUnits() + item.getNumberOfCompletedUnits());
-//                    tzsTwoStaffing.setCompletionRatio(tzsTwoStaffing.getCompletionRatio() + item.getCompletionRatio());
-//                    tzsTwoStaffing.setResponsibleUnitsAllocateNumber(tzsTwoStaffing.getResponsibleUnitsAllocateNumber() + item.getResponsibleUnitsAllocateNumber());
-//                    tzsTwoStaffing.setProportion("0");
-//                });
-//            }else {
-//                tzsTwoStaffing.setNumberOfCompletedUnits(0);
-//                tzsTwoStaffing.setCompletionRatio("0");
-//                tzsTwoStaffing.setResponsibleUnitsAllocateNumber(0);
-//                tzsTwoStaffing.setProportion("0");
-//            }
-//            tzsTwoStaffing.setResponsiblePersonsNumber(0);
-//            tzsTwoStaffing.setSafetyDirectorsNumber(0);
-//            tzsTwoStaffing.setSafetyOfficersNumber(0);
-//            tzsTwoStaffings.add(tzsTwoStaffing);
-//       }
-//        return tzsTwoStaffings;
+    public List<TzsTwoStaffing> getStatisticsMessage(List<LinkedHashMap> list, String type) {
         String orgCode = null;
+        String nextLevel = null;
         if (!ObjectUtils.isEmpty(list) && !ObjectUtils.isEmpty(list.get(0))) {
             orgCode = String.valueOf(list.get(0).get("orgCode"));
+            SupervisoryEnum enumByLevel = SupervisoryEnum.getEnumByLevel(String.valueOf(list.get(0).get("level")));
+            nextLevel = !ObjectUtils.isEmpty(enumByLevel) ? enumByLevel.getNextLevel() : null;
         }
         if (!ObjectUtils.isEmpty(orgCode)) {
-            List<TzsTwoStaffing> listByOrgCode = this.getBaseMapper().getListByOrgCode(orgCode, type, level);
+            List<TzsTwoStaffing> listByOrgCode = this.getBaseMapper().getListByOrgCode(orgCode, type, nextLevel);
             TzsTwoStaffing tzsTwoStaffing = new TzsTwoStaffing();
             tzsTwoStaffing.setSupervisoryUnitName("汇总");
             listByOrgCode.stream().forEach(item -> {