更新96333码

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

@@ -106,7 +106,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         String orgCode = object.getString("orgCode");
         for (Map map : mapList) {
             Map<String, Object> resultMap = new HashMap<>();
-            Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(),level,orgCode);
+            Map<String, Object> map1 = equipmentCategoryMapper.getCategoryCount(map.get("code").toString(), level, orgCode);
             resultMap.put("name", map.get("name"));
             resultMap.put("image", map.get("image"));
             resultMap.put("waitClaim", map1.get("waitClaim"));
@@ -148,7 +148,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         //生成码
         Map<String, String> codeMap = new HashMap<>();
         synchronized (EquipmentCategoryServiceImpl.class) {
-            codeMap = creatCode(city, county, equipCategory, equipList);
+            codeMap = creatCode(city, county, equipCategory, equipList, record);
         }
         //查询最后一条数据并进行修改
         CategoryOtherInfo otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().orderByDesc("REC_DATE").last("limit 1"));
@@ -217,7 +217,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     /**
      * 具体生成监管码和电梯96333识别码逻辑
      */
-    private Map<String, String> creatCode(String city, String county, String equipCategory, String equipList) {
+    private Map<String, String> creatCode(String city, String county, String equipCategory, String equipList, String record) {
         Map<String, String> resultMap = new HashMap<>();
         //生成监管码前缀
         Map<String, Object> divisionMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQH.getCode(), county);
@@ -250,6 +250,11 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         StringBuilder elevatorCode = new StringBuilder();
         //判断是否是否需要生成96333电梯码
         if (EquipmentClassifityEnum.DT.getCode().equals(equipList)) {
+            //查询最后一条数据并进行修改
+            CategoryOtherInfo otherInfo = categoryOtherInfoMapper.selectOne(new QueryWrapper<CategoryOtherInfo>().eq("RECORD", record));
+            if (!ObjectUtils.isEmpty(otherInfo)) {
+                List<CategoryOtherInfo> codeList = categoryOtherInfoMapper.selectList(new QueryWrapper<CategoryOtherInfo>().eq("CODE96333", otherInfo.getCode()));
+                if (ObjectUtils.isEmpty(codeList)) {
                     //生成生成96333电梯码前缀
                     Map<String, Object> elevatorMap = equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), county);
                     String elevator = ObjectUtils.isEmpty(elevatorMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), city).get("code").toString() : elevatorMap.get("code").toString();
@@ -277,6 +282,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                         elevatorCode.append(EquipmentCategoryEnum.CSM.getCode());
                     }
                 }
+            }
+        }
         resultMap.put("supervisorCode", ObjectUtils.isEmpty(supervisorCode.toString()) ? null : supervisorCode.toString());
         resultMap.put("elevatorCode", ObjectUtils.isEmpty(elevatorCode.toString()) ? null : elevatorCode.toString());
         return resultMap;