From f286b6050b155ed50390a8652948d98c65805fec Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 9 Aug 2023 16:13:39 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarBussionessStandServiceImpl.java | 13 ++++++++++---
 .../sarBussionessStand/SarBussionessStandMapper.xml |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

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 c98d1fa2..2501af56 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
@@ -260,18 +260,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             }
         }
         // 没有已存在的记录，则生成新的顺序号返回
-        String maxStandSn = iSarBussStandSnService.selectMaxStandSn(standSort);
+        // 顺序表中最大值
+        String maxSn = iSarBussStandSnService.selectMaxStandSn(standSort);
+        // 企标库中最大值
+        String standMaxSn = iSarBussionessStandService.selectMaxStandSn(standSort);
+        // 如果企标库中的值比顺序表中的值大，则以企标库的值为准
+        if (Integer.parseInt(standMaxSn) > Integer.parseInt(maxSn)) {
+            maxSn = standMaxSn;
+        }
         // 处理顺序号的格式
         if (count >= 1000) {
             StringBuilder formatBuilder = new StringBuilder();
-            for (int i = 0; i < maxStandSn.length(); i++) {
+            for (int i = 0; i < maxSn.length(); i++) {
                 formatBuilder.append("0");
             }
             String format = formatBuilder.toString();
             decimalFormat = new DecimalFormat(format);
         }
         // 1.1.2.2 生成新的顺序号
-        String newStandSn = decimalFormat.format(Integer.parseInt(maxStandSn) + 1);
+        String newStandSn = decimalFormat.format(Integer.parseInt(maxSn) + 1);
         // 1.1.2.3 新的顺序号 存入顺序号表中
         saveBussStandSn(reviseStatus, standSort, newStandSn, taskId);
         // 返回顺序号
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index eb36b713..40d8cabf 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -1258,7 +1258,7 @@
         select * from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1
     </select>
     <select id="selectMaxStandSn" resultType="java.lang.String">
-        select max(STAND_NUMBER) from sar_bussioness_stand where STAND_SORT =#{standSort} and VALID_FLAG = 0
+        select MAX(DISTINCT CAST(STAND_NUMBER AS decimal(9))) from sar_bussioness_stand where STAND_SORT =#{standSort} and VALID_FLAG = 0
     </select>
 
     <update id="updateByIdInfo" >