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

@@ -977,32 +977,50 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                 .collect(Collectors.toList())
                 ).list();
 
-        registrationList.forEach(registrationManage -> {
-            registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
-            registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
-            registrationManage.setAuditPassDate(new Date());
-            registrationManage.setEquUseAddress(transfer.getFullAddress());
-            if (isUpdateRegistrationCode && !StringUtils.isEmpty(registrationManage.getUseRegistrationCode())
-                    && device.getUseRegistrationCode() != null && device.getUseRegistrationCode().equals(registrationManage.getUseRegistrationCode())) {
-                registrationManage.setUseRegistrationCode(useRegistrationCode);
-            }
-            registrationManage.setCertificateStatus("已登记");
-            registrationManage.setApplyNo(transfer.getApplyNo());
-        });
+        List<JgUseRegistrationManage> newRegistrationList = new ArrayList<>();
         List<JSONObject> updatedRegistrationList = registrationList.stream()
                 .map(registrationManage -> {
-                    JSONObject jsonObject = (JSONObject) JSON.toJSON(registrationManage);
+                    // 创建并设置新的 JgUseRegistrationManage 对象
+                    JgUseRegistrationManage registrationManageNew = new JgUseRegistrationManage();
+                    BeanUtils.copyProperties(registrationManage, registrationManageNew);
+                    registrationManageNew.setReceiveOrgName(transfer.getReceiveOrgName());
+                    registrationManageNew.setReceiveCompanyCode(transfer.getReceiveOrgCode());
+                    registrationManageNew.setAuditPassDate(new Date());
+                    registrationManageNew.setEquUseAddress(transfer.getFullAddress());
+
+                    // 更新使用登记码逻辑
+                    if (isUpdateRegistrationCode &&
+                            !StringUtils.isEmpty(registrationManageNew.getUseRegistrationCode()) &&
+                            device.getUseRegistrationCode() != null &&
+                            device.getUseRegistrationCode().equals(registrationManageNew.getUseRegistrationCode())) {
+                        registrationManageNew.setUseRegistrationCode(useRegistrationCode);
+                    }
+
+                    registrationManageNew.setCertificateStatus("已登记");
+                    registrationManageNew.setApplyNo(transfer.getApplyNo());
+                    registrationManageNew.setSequenceNbr(null);
+
+                    // 添加到新列表中
+                    newRegistrationList.add(registrationManageNew);
+
+                    // 创建并返回 JSON 对象
+                    JSONObject jsonObject = (JSONObject) JSON.toJSON(registrationManageNew);
                     jsonObject.put("auditPassDate", new SimpleDateFormat("yyyy-MM-dd").format(registrationManage.getAuditPassDate()));
-                    jsonObject.put("applyNo", transfer.getApplyNo());
-                    jsonObject.put("equUseAddress", registrationManage.getEquUseAddress());
-                    jsonObject.put("certificateStatus", registrationManage.getCertificateStatus());
-                    jsonObject.put("receiveCompanyCode", registrationManage.getReceiveCompanyCode());
-                    jsonObject.put("receiveOrgName", registrationManage.getReceiveOrgName());
-                    jsonObject.put("regType", registrationManage.getRegType());
+                    jsonObject.put("applyNo", registrationManageNew.getApplyNo());
+                    jsonObject.put("equUseAddress", registrationManageNew.getEquUseAddress());
+                    jsonObject.put("certificateStatus", registrationManageNew.getCertificateStatus());
+                    jsonObject.put("receiveCompanyCode", registrationManageNew.getReceiveCompanyCode());
+                    jsonObject.put("receiveOrgName", registrationManageNew.getReceiveOrgName());
+                    jsonObject.put("regType", registrationManageNew.getRegType());
+
                     return jsonObject;
                 })
                 .collect(Collectors.toList());
-        useRegistrationManageService.updateBatchById(registrationList);
+
+        // 批量保存新的注册管理对象
+        useRegistrationManageService.saveBatch(newRegistrationList);
+
+        // 保存历史数据
         historyJson.put("registrationList", updatedRegistrationList);
         historyData.setChangeData(JSONObject.toJSONString(historyJson));
     }

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

@@ -2541,6 +2541,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         JgUseRegistrationManage registrationManage = new JgUseRegistrationManage();
         registrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+        registrationManage.setIsDelete(true);
         LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode());
         jgUseRegistrationManageMapper.update(registrationManage, wrapper);