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/edit/event/listener/ChangeEquipImpactCertListener.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit.event.listener;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.module.jg.api.converter.EquDefineConverter;
 import com.yeejoin.amos.boot.module.jg.api.dto.FieldChangeMeta;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
@@ -117,6 +118,7 @@ public class ChangeEquipImpactCertListener {
                         keysToJson.add(CERTIFICATE_NORMAL);
                         break;
                     default:
+                        this.updateUseCertField(manage, meta);
                         log.warn("未知分类字段：[{}]", category);
                 }
             }
@@ -233,20 +235,43 @@ public class ChangeEquipImpactCertListener {
     }
 
     private void handleDefaultRegistration(BaseBizDataChangeEvent event) {
-        if (event.getBizRelationData().getBizIsFinished()){
-                String equId = Stream.concat(
-                        Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
-                        Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
-                ).findFirst().orElse(null);
-                LambdaQueryWrapper<IdxBizJgRegisterInfo> queryRegisterWrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-                queryRegisterWrapper.eq(IdxBizJgRegisterInfo::getRecord, equId);
-                IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(queryRegisterWrapper);
-            JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
-                    .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
-                    .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .one();
-            this.handleFieldChange(event.getData(), jgUseRegistrationManage);
+        String equId = Stream.concat(
+                Optional.ofNullable(event.getBizRelationData().getProjectContraptionIds()).orElse(Collections.emptySet()).stream(),
+                Optional.ofNullable(event.getBizRelationData().getRecords()).orElse(Collections.emptySet()).stream()
+        ).findFirst().orElse(null);
+        if (StringUtils.isBlank(equId)) {
+            log.warn("[handleDefaultRegistration] 未找到设备ID，eventId={}", event.getBizRelationData().getBizId());
+            return;
+        }
+        IdxBizJgRegisterInfo registerInfo = registerInfoMapper.selectOne(
+                Wrappers.<IdxBizJgRegisterInfo>lambdaQuery()
+                        .eq(IdxBizJgRegisterInfo::getRecord, equId)
+        );
+        if (registerInfo == null) {
+            log.warn("[handleDefaultRegistration] 未查询到登记信息，equId={}", equId);
+            return;
+        }
+        String useOrgCode = event.getData().stream()
+                .filter(m -> "useOrgCode".equals(m.getColumnKey()))
+                .map(FieldChangeMeta::getColumnOldValue)
+                .findFirst()
+                .orElse(registerInfo.getUseOrgCode());
+        if (StringUtils.isBlank(useOrgCode)) {
+            log.warn("[handleDefaultRegistration] useOrgCode 为空，equId={}", equId);
+            return;
+        }
+        // 查询使用登记证管理信息
+        JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, useOrgCode)
+                .eq(JgUseRegistrationManage::getIsDelete, 0)
+                .one();
+
+        if (jgUseRegistrationManage == null) {
+            log.info("[handleDefaultRegistration] 未找到使用登记证信息，useOrgCode={}", useOrgCode);
+            return;
         }
+        handleFieldChange(event.getData(), jgUseRegistrationManage);
+        log.debug("[handleDefaultRegistration] 字段变更处理完成，useOrgCode={}", useOrgCode);
     }
 
     private void handleUsageRegistration(BaseBizDataChangeEvent event) {