fix(jg):使用登记暂存功能

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

@@ -581,8 +581,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             LambdaQueryWrapper<IdxBizJgOtherInfo> otherLambda = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
             otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
             IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
-            String supervisoryCode = otherInfo.getSupervisoryCode();
-            jgUseRegistration.setSupervisoryCode(supervisoryCode);
+            if (otherInfo != null) {
+                String supervisoryCode = otherInfo.getSupervisoryCode();
+                jgUseRegistration.setSupervisoryCode(supervisoryCode);
+            }
             jgUseRegistration.setManageType("set");
 
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
@@ -602,7 +604,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistration.setSupervisionOrgCode(splitOrgBranchCode[0]);
             }
             // 安全管理员
-            if (map.containsKey("safetyManager")) {
+            if (map.containsKey("safetyManager")&& map.get("safetyManager") != null) {
                 String[] data = String.valueOf(map.getString("safetyManager")).split("_");
                 map.put("safetyManagerId", data[0]);
                 map.put("safetyManagerName", data[1]);
@@ -680,7 +682,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
                 // 业务管理设备信息保存
                 JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
-                jgRelationEquip.setEquId(map.get("equipId").toString());
+                jgRelationEquip.setEquId(Objects.toString(map.get("equipId"), ""));
                 //            List<String> applicationFormCode = iCreateCodeServicevice.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
                 //            jgUseRegistration.setApplyNo(applicationFormCode.get(0));
                 //            ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
@@ -696,7 +698,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgRelationEquipMapper.insert(jgRelationEquip);
             }
             // 暂存历史表
-            updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
+            updateHistory(map, Objects.toString(map.get("equipId"), ""), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
             if (!ObjectUtils.isEmpty(map.get("submit"))) {
                 // 删除暂存代办
                 commonServiceImpl.deleteTasksByRelationId(String.valueOf(jgUseRegistration.getSequenceNbr()));
@@ -2260,7 +2262,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 补充"车牌号"字段
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
                 IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
-                jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
+                if (idxBizJgRegisterInfo != null) {
+                    jsonObject.put("carNumber", idxBizJgRegisterInfo.getCarNumber());
+                }
             } else {
                 List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) jsonObject.get("equipmentLists");
                 List<String> records = equipmentLists.stream().map(v -> (String) v.get("record")).collect(toList());
@@ -3038,6 +3042,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     public void fillLastEquipBaseInfo(JSONObject jsonObject, String record) {
+        if (StringUtils.isEmpty(record)) {
+            return;
+        }
         // 基本信息 + 制造信息
         Map<String, Object> detail = this.baseMapper.getDetail(record);
         // 设计信息