一码通赋码返回值修改

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

@@ -197,15 +197,15 @@ 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"));
+        supervisoryCodeInfo.setCode96333(codeMap.get("code96333"));
+        supervisoryCodeInfo.setSupervisoryCode(codeMap.get("superviseCode"));
         supervisoryCodeInfo.setStatus(equState);
         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");
+            supervisorCode = codeMap.get("superviseCode");
+            elevatorCode = EquipmentCategoryEnum.BF.getCode().equals(equInfoDto.getEquState()) ? null : codeMap.get("code96333");
             List<CategoryOtherInfo> categoryOtherInfo = categoryOtherInfoMapper.selectList(new QueryWrapper<CategoryOtherInfo>().eq("SUPERVISORY_CODE", supervisorCode));
             if (categoryOtherInfo.size() > 0) {
                 categoryOtherInfoMapper.updateCode(supervisorCode, equState);
@@ -451,8 +451,9 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         if (ObjectUtils.isEmpty(supervisorCode) && ObjectUtils.isEmpty(elevatorCode)) {
             return new HashMap<>();
         }
-        resultMap.put("supervisorCode", ObjectUtils.isEmpty(supervisorCode) ? null : supervisorCode.toString());
-        resultMap.put("elevatorCode", ObjectUtils.isEmpty(elevatorCode) ? null : elevatorCode.toString());
+        resultMap.put("superviseCode", ObjectUtils.isEmpty(supervisorCode) ? null : supervisorCode.toString());
+        resultMap.put("code96333", ObjectUtils.isEmpty(elevatorCode) ? null : elevatorCode.toString());
+        resultMap.put("qrCode",ObjectUtils.isEmpty(supervisorCode) ? null : supervisorCode.toString());
         return resultMap;
     }