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/controller/JgChangeRegistrationReformController.java

@@ -192,10 +192,16 @@ public class JgChangeRegistrationReformController extends BaseController {
         }
         if (!ObjectUtils.isEmpty(transferCity)) {
             String[] cityList = transferCity.split("_");
+            //区内移装
             if (cityList.length > 1 && "0".equals(transferType)) {
                 dto.setCityName(cityList[1]);
             }
         }
+        //区外移装查询未报废状态的证
+        if (!ObjectUtils.isEmpty(transferType)) {
+            dto.setIsScrap("0");
+        }
+        //区外移装查询已注销状态的证
         dto.setCertificateStatus("1".equals(transferType) ? "已注销" : "已登记");
         return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getUseRegistrationCodeData(page, dto));
     }

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

@@ -988,9 +988,21 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                 .collect(Collectors.toList())
                 ).list();
 
+        useRegistrationManageService.lambdaUpdate()
+                .set(JgUseRegistrationManage::getIsScrap, 1)
+                .in(JgUseRegistrationManage::getSequenceNbr,
+                        registrationList.stream()
+                                .map(JgUseRegistrationManage::getSequenceNbr)
+                                .collect(Collectors.toList())
+                )
+                .update();
+
         List<JgUseRegistrationManage> newRegistrationList = new ArrayList<>();
         List<JSONObject> updatedRegistrationList = registrationList.stream()
                 .map(registrationManage -> {
+                    Map<String, String> equType = new HashMap<>();
+                    equType.put("equListCode", registrationManage.getEquCategoryCode());
+                    equType.put("equCategoryCode", registrationManage.getEquDefineCode());
                     // 创建并设置新的 JgUseRegistrationManage 对象
                     JgUseRegistrationManage registrationManageNew = new JgUseRegistrationManage();
                     BeanUtils.copyProperties(registrationManage, registrationManageNew);
@@ -1010,6 +1022,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     registrationManageNew.setCertificateStatus("已登记");
                     registrationManageNew.setApplyNo(transfer.getApplyNo());
                     registrationManageNew.setSequenceNbr(null);
+                    registrationManageNew.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, registrationManageNew.getAuditPassDate(), transfer.getReceiveCompanyCode()));
 
                     // 添加到新列表中
                     newRegistrationList.add(registrationManageNew);
@@ -1018,6 +1031,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     JSONObject jsonObject = (JSONObject) JSON.toJSON(registrationManageNew);
                     jsonObject.put("auditPassDate", new SimpleDateFormat("yyyy-MM-dd").format(registrationManage.getAuditPassDate()));
                     jsonObject.put("applyNo", registrationManageNew.getApplyNo());
+                    jsonObject.put("certificateNo", registrationManageNew.getCertificateNo());
                     jsonObject.put("equUseAddress", registrationManageNew.getEquUseAddress());
                     jsonObject.put("certificateStatus", registrationManageNew.getCertificateStatus());
                     jsonObject.put("receiveCompanyCode", registrationManageNew.getReceiveCompanyCode());