一码通删除修改码表状态

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

@@ -971,14 +971,19 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         SupervisoryCodeInfo supervisoryCodeInfo = new SupervisoryCodeInfo();
         ResponseModel responseModel = new ResponseModel();
         LinkedHashMap useInfoFrom = (LinkedHashMap) map.get(USE_INFO_FROM_ID);
-        Calendar calendar= Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         useInfoFrom.put("REC_DATE", dateFormat.format(calendar.getTime()));
+
+        LinkedHashMap superviseMap = (LinkedHashMap) map.get("data");
         String unitCode = String.valueOf(useInfoFrom.get("USE_UNIT_CREDIT_CODE"));
+        String code96333 = String.valueOf(superviseMap.get("code96333"));
+        String supervisionCode = String.valueOf(superviseMap.get("supervisionCode"));
+
+        supervisoryCodeInfo.setCode96333("null".equals(code96333) ? null : code96333);
+        supervisoryCodeInfo.setSupervisoryCode("null".equals(supervisionCode) ? null : supervisionCode);
         try {
-            LinkedHashMap superviseMap = (LinkedHashMap) map.get("data");
             String claimStatus = String.valueOf(superviseMap.get("claimStatus"));
-            String code96333 = String.valueOf(superviseMap.get("code96333"));
             String operateType = String.valueOf(superviseMap.get("operateType"));
             //生成码
             Map<String, String> codeMap;
@@ -987,7 +992,6 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 String city = String.valueOf(superviseMap.get("city"));
                 String county = String.valueOf(superviseMap.get("county"));
                 String equCategory = String.valueOf(superviseMap.get("equCategory"));
-                String supervisionCode = String.valueOf(superviseMap.get("supervisionCode"));
                 //生成码
                 codeMap = creatCode(city, county, equCategory, code96333, supervisionCode);
                 log.info("已生成对应监管码或96333电梯识别码");
@@ -996,6 +1000,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                 LinkedHashMap supervisionMap = (LinkedHashMap) map.get(SUPERVISION_FROM_ID);
                 supervisionMap.put("CODE96333", codeMap.get("code96333"));
                 supervisionMap.put("SUPERVISORY_CODE", codeMap.get("superviseCode"));
+                supervisoryCodeInfo.setCode96333(codeMap.get("code96333"));
+                supervisoryCodeInfo.setSupervisoryCode(codeMap.get("superviseCode"));
                 map.put(SUPERVISION_FROM_ID, supervisionMap);
                 //根据操作状态判断是调用新增还是修改接口
                 responseModel = "save".equals(operateType) ? idxFeignService.batchSubmit(null, null, null, null, map) :
@@ -1026,7 +1032,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             return response;
         } finally {
             updateEquipmentCategoryData(unitCode);
-            supervisoryCodeInfoMapper.update(supervisoryCodeInfo,new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code",supervisoryCodeInfo.getSupervisoryCode()));
+            supervisoryCodeInfoMapper.update(supervisoryCodeInfo, new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisoryCodeInfo.getSupervisoryCode()));
         }
         return responseModel;
     }