Merge branch 'develop_tzs_register' of…

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

@@ -933,7 +933,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             AtomicBoolean isUpdateRegistrationCode = new AtomicBoolean(false);
             transferEqList.forEach(device -> {
                 String supervisoryCode = "", code96333 = "";
-                //如果是区内移装，判断是否为韩城，杨凌，需要变更证号，否则不变证号
+                //区外移装
                 if ("1".equals(transfer.getTransferType())) {
                     Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                     supervisoryCode = supervisoryCodeMap.get("superviseCode");
@@ -942,6 +942,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
                 } else {
+                    //如果是区内移装，判断是否为韩城，杨凌，需要变更证号，否则不变证号
                     JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
                     String county = newPosition.getString("transferCounty").split("_")[0];
                     boolean shouldUpdateCode = Arrays.stream(ReginStepEnum.values())
@@ -988,6 +989,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                 .collect(Collectors.toList())
                 ).list();
 
+        //区外移装更新是否报废字段为1，区内移装不变
+        if ("1".equals(transfer.getTransferType())){
             useRegistrationManageService.lambdaUpdate()
                     .set(JgUseRegistrationManage::getIsScrap, 1)
                     .in(JgUseRegistrationManage::getSequenceNbr,
@@ -996,6 +999,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                     .collect(Collectors.toList())
                     )
                     .update();
+        }
 
         List<JgUseRegistrationManage> newRegistrationList = new ArrayList<>();
         List<JSONObject> updatedRegistrationList = registrationList.stream()
@@ -1022,8 +1026,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
                     registrationManageNew.setCertificateStatus("已登记");
                     registrationManageNew.setApplyNo(transfer.getApplyNo());
+                    if ("1".equals(transfer.getTransferType())){
                         registrationManageNew.setSequenceNbr(null);
                         registrationManageNew.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, registrationManageNew.getAuditPassDate(), transfer.getReceiveCompanyCode()));
+                    }
 
                     // 添加到新列表中
                     newRegistrationList.add(registrationManageNew);
@@ -1044,7 +1050,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 .collect(Collectors.toList());
 
         // 批量保存新的注册管理对象
-        useRegistrationManageService.saveBatch(newRegistrationList);
+        useRegistrationManageService.saveOrUpdateBatch(newRegistrationList);
 
         // 保存历史数据
         historyJson.put("registrationList", updatedRegistrationList);