21094 单位变更流程结束后，设备未从原使用单位变更到新使用单位

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/JgChangeRegistrationUnitServiceImpl.java

@@ -469,7 +469,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     public void saveRecord(JgChangeRegistrationUnit registrationUnit) {
         Long sequenceNbr = registrationUnit.getSequenceNbr();
         List<JgChangeRegistrationUnitEq> eqList = registrationUnitEqService.lambdaQuery().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, sequenceNbr).list();
-        List<JgRegistrationHistory> historyList = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).list();
+        List<JgRegistrationHistory> historyList = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, registrationUnit.getApplyNo()).list();
         if (historyList.size() != 1) {
             return;
         }
@@ -503,7 +503,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     JSONObject deviceJson = JSON.parseObject(unitEq.getDeviceInfo());
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
                     changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString());//登记证记录主键
-                    changeRecordEq.setRecDate(new Date());
                     changeRecordEq.setEquId(deviceJson.getString("SEQUENCE_NBR"));//设备主键
                     changeRecordEqList.add(changeRecordEq);
                 }
@@ -709,7 +708,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 unitEq.setRegistrationCertificate(device.getString("USE_ORG_CODE"));//使用登记证主键
             }
             if (device.containsKey("SEQUENCE_NBR")) {
-                unitEq.setEquId(device.getString("USE_ORG_CODE"));//设备主键
+                unitEq.setEquId(device.getString("SEQUENCE_NBR"));//设备主键
             }
             unitEq.setUnitChangeRegistrationId(registrationUnit.getSequenceNbr().toString());//单位变更业务主键
             unitEq.setDeviceInfo(JSONObject.toJSONString(device));//设备信息json
@@ -1016,23 +1015,23 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                             queryWrapper2.eq(UseInfo::getRecord, equipId);
                             UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
-                            String code = commonServiceImpl.generateRegistrationCode(equipId, tzsJgOtherInfo.getSupervisoryCode(), dto.getReceiveCompanyCode());
+//                            String code = commonServiceImpl.generateRegistrationCode(equipId, tzsJgOtherInfo.getSupervisoryCode(), dto.getReceiveCompanyCode());
                             if (ObjectUtils.isNotEmpty(useInfo)) {
                                 useInfo.setUseUnitName(registration.getNewUseUnitName());
                                 useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-                                if (ValidationUtil.isEmpty(code)) {
-                                    log.error("生成新的使用登记证编号失败");
-                                    return;
-                                }
+//                                if (ValidationUtil.isEmpty(code)) {
+//                                    log.error("生成新的使用登记证编号失败");
+//                                    return;
+//                                }
                                 useInfoMapper.updateById(useInfo);
 //                        jgChangeRegistrationUnit.setUseRegistCode(code);
                             }
                             //更新使用注册登记证编号
-                            idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, code);
+//                            idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, code);
                             //es中的编号信息
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
-                            map1.put("USE_ORG_CODE", code);
+//                            map1.put("USE_ORG_CODE", code);
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
                             map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                             resultMap.put(equipId, map1);