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

@@ -2676,7 +2676,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void historyEquUpdateMaintenanceInfo(JSONObject map){
         SimpleDateFormat format = new SimpleDateFormat();
         IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(info)) {
+        if (!ValidationUtil.isEmpty(info.getSequenceNbr())) {
             info.setMeUnitName(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[1]);
             info.setMeUnitCreditCode(ValidationUtil.isEmpty(map.get("meUnitName")) ? null : String.valueOf(map.get("meUnitName")).split("_")[0]);
             info.setMeMaster(ValidationUtil.isEmpty(map.get("meMaster")) ? null : String.valueOf(map.get("meMaster")));
@@ -2693,8 +2693,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 log.info("date转化失败");
             }
             info.setRepairInform(ValidationUtil.isEmpty(map.get("repairInform")) ? null : JSONObject.toJSONString(map.get("repairInform")));
+            idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
         }
-        idxBizJgMaintenanceRecordInfoService.getBaseMapper().updateById(info);
     }
 
     /**
@@ -2703,7 +2703,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void historyEquUpdateInstallInfo(JSONObject map){
 
         IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
-        if (!ValidationUtil.isEmpty(constructionInfo)) {
+        if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
             constructionInfo.setUscUnitCreditCode(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[0]);
             constructionInfo.setUscUnitName(ValidationUtil.isEmpty(map.get("uscUnitCodeAndName")) ? null : String.valueOf(map.get("uscUnitCodeAndName")).split("_")[1]);
             constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
@@ -2711,8 +2711,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
             constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
             constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
+            idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
         }
-        idxBizJgConstructionInfoService.getBaseMapper().updateById(constructionInfo);
     }
 
     private void historyEquGenManageRelated(JSONObject map,JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo,IdxBizJgFactoryInfo idxBizJgFactoryInfo){