From 8db3ef8bd4e192ba7501f763f77294c8a7ab7757 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 21 Nov 2023 11:10:43 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E5=8F=B7=E5=8F=91=E5=B8=83=E6=97=B6=E5=A4=9A=E4=BD=99=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarBussionessStandController.java         |  4 +--
 .../service/ISarBussionessStandService.java   |  2 +-
 .../impl/SarBussionessStandServiceImpl.java   | 27 ++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
index cd45358c..d7c55e74 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
@@ -732,8 +732,8 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
 
     @ApiOperation(value = "企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验")
     @PostMapping("/ifStandCodebyStandName")
-    public ResponseMessage ifStandCodeByStandName(String standCode,String standName,String taskIds,String standNum){
-        return sarBussionessStandEOService.ifStandCodeByStandName(standCode,standName,taskIds,standNum);
+    public ResponseMessage ifStandCodeByStandName(String standCode,String standName,String taskIds,String standNum,String standSort){
+        return sarBussionessStandEOService.ifStandCodeByStandName(standCode,standName,taskIds,standNum,standSort);
     }
 }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
index 26b308cb..29c1a0d8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
@@ -73,6 +73,6 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
 
     String selectMaxStandSn(String standSort);
 
-    ResponseMessage ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum);
+    ResponseMessage ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum,String standSort);
 }
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 7133d5c8..aed9c857 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -4735,7 +4735,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     }
 
     @Override
-    public ResponseMessage<?> ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum) {
+    public ResponseMessage<?> ifStandCodeByStandName(String standCode, String standName, String taskIds, String standNum, String standSort) {
         if (StringUtils.isBlank(standCode) || StringUtils.isBlank(standName)) {
             return Result.error("企标编号或企标名称不能为空");
         }
@@ -4758,11 +4758,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                     updateWrapper.set(SarBussStandSn::getTaskId,null);
                     sarBussStandSnService.update(updateWrapper);
                     // 保存新的顺序号
-                    sarBussStandSn.setId(UUIDUtils.randomUUID20());
-                    sarBussStandSn.setStandSn(standNum);
-                    sarBussStandSn.setCreationTime(new Date());
-                    sarBussStandSn.setModifyTime(new Date());
-                    sarBussStandSnService.save(sarBussStandSn);
+                    SarBussStandSn sarBussStandSn1 = new SarBussStandSn();
+                    sarBussStandSn1.setId(UUIDUtils.randomUUID20());
+                    sarBussStandSn1.setReviseStatus(sarBussStandSn.getReviseStatus());
+                    sarBussStandSn1.setUseStatus("yes");
+                    sarBussStandSn1.setValidFlag("0");
+                    sarBussStandSn1.setStandSort(standSort);
+                    sarBussStandSn1.setTaskId(taskIds);
+                    sarBussStandSn1.setStandSn(standNum);
+                    sarBussStandSn1.setCreationTime(new Date());
+                    sarBussStandSn1.setModifyTime(new Date());
+                    sarBussStandSnService.save(sarBussStandSn1);
+                } else {
+                    // 去除多余占用的顺序号
+                    LambdaUpdateWrapper<SarBussStandSn> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(SarBussStandSn::getTaskId,taskIds);
+                    updateWrapper.ne(SarBussStandSn::getStandSn,standNum);
+                    updateWrapper.set(SarBussStandSn::getValidFlag,"1");
+                    updateWrapper.set(SarBussStandSn::getUseStatus,"no");
+                    updateWrapper.set(SarBussStandSn::getTaskId,null);
+                    sarBussStandSnService.update(updateWrapper);
                 }
             }
         }