修改监管码生成

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

@@ -234,13 +234,13 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             if (ObjectUtils.isEmpty(map)) {
                 map = getRegionList();
             }
-            list = (List<LinkedHashMap>)map.get(regionCode);
-            return  list;
+            list = (List<LinkedHashMap>) map.get(regionCode);
+            return list;
         }
     }
 
-    public Map<String,Object> getRegionList() {
-        Map<String,Object> map1 = new HashMap<>();
+    public Map<String, Object> getRegionList() {
+        Map<String, Object> map1 = new HashMap<>();
         List<LinkedHashMap> cityList = new ArrayList<>();
         FeignClientResult tree = privilegeFeginService.getTree();
         List<LinkedHashMap> result = (List<LinkedHashMap>) tree.getResult();
@@ -252,7 +252,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         redisUtils.set(CITY, cityMap);
 
         if (!ObjectUtils.isEmpty(cityList)) {
-            List<LinkedHashMap> region = (List<LinkedHashMap>)privilegeFeginService.getTree().getResult();
+            List<LinkedHashMap> region = (List<LinkedHashMap>) privilegeFeginService.getTree().getResult();
             Map<String, Object> map = new HashMap<>();
             for (LinkedHashMap linkedHashMap : cityList) {
                 List<LinkedHashMap> regionList = deleteTreeData(region, linkedHashMap.get("regionCode").toString());
@@ -309,31 +309,35 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
         String division = ObjectUtils.isEmpty(divisionMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), city).get("code").toString() : divisionMap.get("code").toString();
         StringBuilder supervisorCode = new StringBuilder();
-        supervisorCode.append(division).append(equipCategory).append("-");
         //获取行政区划区县、市是否存在历史监管码
         CategoryOtherInfo supervisor = categoryOtherInfoMapper.selectSupervisorCode(supervisorCode.toString());
         //查询对应record对应数据
         CategoryOtherInfo otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().eq("RECORD", record));
-        if (!ObjectUtils.isEmpty(otherInfo) && ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
-            //生成对应监管码
-            if (!ObjectUtils.isEmpty(supervisor)) {
-                if (supervisor.getSupervisoryCode() != null) {
-                    //获取补零位长度
-                    String supervisoryCode = supervisor.getSupervisoryCode().substring(4);
-                    long num = Long.valueOf(supervisoryCode) + 1;
-                    int numLength = String.valueOf(num).length();
-                    int a = 7 - numLength;
-                    StringBuilder zero = new StringBuilder();
-                    for (int i = 0; i < a; i++) {
-                        zero.append(EquipmentCategoryEnum.BLW.getCode());
+        if (!ObjectUtils.isEmpty(otherInfo)) {
+            if (!ObjectUtils.isEmpty(otherInfo.getSupervisoryCode())) {
+                supervisorCode = new StringBuilder(otherInfo.getSupervisoryCode());
+            } else {
+                supervisorCode.append(division).append(equipCategory).append("-");
+                //生成对应监管码
+                if (!ObjectUtils.isEmpty(supervisor)) {
+                    if (supervisor.getSupervisoryCode() != null) {
+                        //获取补零位长度
+                        String supervisoryCode = supervisor.getSupervisoryCode().substring(4);
+                        long num = Long.valueOf(supervisoryCode) + 1;
+                        int numLength = String.valueOf(num).length();
+                        int a = 7 - numLength;
+                        StringBuilder zero = new StringBuilder();
+                        for (int i = 0; i < a; i++) {
+                            zero.append(EquipmentCategoryEnum.BLW.getCode());
+                        }
+                        zero.append(num);
+                        supervisorCode.append(zero);
+                    } else {
+                        supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
                     }
-                    zero.append(num);
-                    supervisorCode.append(zero);
                 } else {
                     supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
                 }
-            } else {
-                supervisorCode.append(EquipmentCategoryEnum.JGM.getCode());
             }
         }