一码通bug修改

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

@@ -175,22 +175,25 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         }
         log.info(record + "已生成对应监管码或96333电梯识别码");
         String equState = EquipmentCategoryEnum.CSZT.getCode();
-
+        SupervisoryCodeInfo supervisoryCodeInfo = new SupervisoryCodeInfo();
+        supervisoryCodeInfo.setCode96333(codeMap.get("elevatorCode"));
+        supervisoryCodeInfo.setSupervisoryCode(codeMap.get("supervisorCode"));
         if (!ObjectUtils.isEmpty(record)) {
             String supervisorCode, elevatorCode;
             //设备状态为报废，对应电梯码作废
             equState = EquipmentCategoryEnum.BF.getCode().equals(equInfoDto.getEquState()) ? EquipmentCategoryEnum.WSY.getCode() : EquipmentCategoryEnum.YSY.getCode();
             supervisorCode = codeMap.get("supervisorCode");
             elevatorCode = EquipmentCategoryEnum.BF.getCode().equals(equInfoDto.getEquState()) ? null : codeMap.get("elevatorCode");
-            //对应电梯码作废
-            categoryOtherInfoMapper.updateCode(equInfoDto.getCode(), equState);
+            List<CategoryOtherInfo> categoryOtherInfo = categoryOtherInfoMapper.selectList(new QueryWrapper<CategoryOtherInfo>().eq("SUPERVISORY_CODE", supervisorCode));
+            if (categoryOtherInfo.size() > 0) {
+                categoryOtherInfoMapper.updateCode(equInfoDto.getCode(), equState);
+            } else {
+                supervisoryCodeInfo.setStatus(equState);
+                supervisoryCodeInfoMapper.insert(supervisoryCodeInfo);
+            }
             //修改源数据的电梯码
             categoryOtherInfoMapper.updateSupervisorCode(supervisorCode, elevatorCode, record);
         } else {
-            SupervisoryCodeInfo supervisoryCodeInfo = new SupervisoryCodeInfo();
-            supervisoryCodeInfo.setCode96333(codeMap.get("elevatorCode"));
-            supervisoryCodeInfo.setSupervisoryCode(codeMap.get("supervisorCode"));
-            supervisoryCodeInfo.setStatus(equState);
             supervisoryCodeInfoMapper.insert(supervisoryCodeInfo);
         }
         return codeMap;
@@ -300,7 +303,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     }
 
     @Override
-    public List<CategoryOtherInfo> checkCode(Map<String,Object> obj) {
+    public List<CategoryOtherInfo> checkCode(Map<String, Object> obj) {
         List<CategoryOtherInfo> codeList = categoryOtherInfoMapper.selectList(new QueryWrapper<CategoryOtherInfo>().eq("CODE96333", obj.get("code")));
         return codeList;
     }