fix(jg):已注销历史设备，办理历史登记，提示保存失败，接口机构code取错值导致

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

@@ -1620,10 +1620,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
         // 流水表不需要再次生成唯一编号，使用证管理表对应值
         if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())) {
-            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
-                    .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
-                    .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).one();
+            JgUseRegistrationManage manage =
+                    jgUseRegistrationManageService.lambdaQuery()
+                            .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                            .eq(JgUseRegistrationManage::getIsDelete, 0)
+                            .orderByDesc(JgUseRegistrationManage::getRecDate)
+                            .last("limit 1")
+                            .one();
             changeRecord.setCertificateNo(ValidationUtil.isEmpty(manage) ? this.genCertificateNo(registerInfo, jgUseRegistration) : manage.getCertificateNo());//登记证书唯一码
         }
         changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
@@ -1643,7 +1646,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             log.error("日期转换失败：", e);
         }
         String equCode = Optional.ofNullable(registerInfo.getEquDefine()).orElse(registerInfo.getEquCategory());
-        String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistration.getReceiveCompanyOrgCode()) + ym;
+        String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistration.getReceiveCompanyCode()) + ym;
         return tzsServiceFeignClient.deviceRegistrationCode(registrationCode).getResult();
     }
 
@@ -3839,6 +3842,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Iterable<ESEquipmentInfo> esEquipmentInfosSnapshot = esEquipmentDao.findAllById(records);
             try {
                 this.updateById(jgUseRegistration);
+                //如果是历史登记，使用登记证编号可编辑，需要从设备中拿取最新的证号进行更新
+                if ("1".equals(jgUseRegistration.getRegType())) {
+                    records.stream().findFirst()
+                            .map(idxBizJgRegisterInfoMapper::getUseOrgCodeByEquip)
+                            .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
+                            .ifPresent(jgUseRegistration::setUseRegistrationCode);
+                }
                 // 处理非批量导入数据，更新关联业务状态
                 processElseDataByStatusSet(oldStatus, jgUseRegistration);
                 // es数据处理 提出来便于进行异常回调