From be1fc9a7b2c2e81e5814ab545e38a47928b042ba Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Tue, 6 Jun 2023 15:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E6=A0=A1=E9=AA=8C=E9=A1=BA=E5=BA=8F=E5=8F=B7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/sarBussStandSn/dao/SarBussStandSnDao.java   |  3 +++
 .../service/ISarBussStandSnService.java              |  2 ++
 .../service/impl/SarBussStandSnServiceImpl.java      |  5 +++++
 .../service/impl/SarBussionessStandServiceImpl.java  | 12 +++++++++---
 .../mapper/sarBussStandSn/SarBussStandSnMapper.xml   |  3 +++
 .../sarBussionessStand/SarBussionessStandMapper.xml  |  2 +-
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java
index 717bd587..15c0c482 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarBussStandSn.dao;
 
 import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -16,4 +17,6 @@ public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
     String selectMaxStandnSn();
 
     String selectMaxStandSn(String standSort);
+
+    String selectStandSort(String standSort);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java
index 237e6461..462326bd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java
@@ -20,4 +20,6 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
     String selectMaxStandnSn();
 
     String selectMaxStandSn(String standSort);
+
+    String selectStandSort(String standSort);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java
index 39f9b3a3..c3984c0b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java
@@ -70,4 +70,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
     public String selectMaxStandSn(String standSort) {
         return baseMapper.selectMaxStandSn(standSort);
     }
+
+    @Override
+    public String selectStandSort(String standSort) {
+        return baseMapper.selectStandSort(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 b33089b6..2f967a0c 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
@@ -220,6 +220,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Override
     public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
         SarBussionessStand bussionessStand = new SarBussionessStand();
+        String snStandSort = iSarBussStandSnService.selectStandSort(standSort);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
         int count = iSarBussStandSnService.count(queryWrapper);
@@ -250,13 +251,16 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                 }else {
 
                     QueryWrapper wrapper1 = new QueryWrapper();
-                    wrapper1.select("MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS STAND_SN");
+                    //wrapper1.select("MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS STAND_SN");
+                    wrapper1.select("MAX(DISTINCT CAST(STAND_SN AS decimal(9))) AS STAND_SN");
                     wrapper1.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
                     SarBussStandSn one = iSarBussStandSnService.getOne(wrapper1);
                     // 1.1.2.2 返回顺序号
                     bussionessStand.setNewStandSn(one.getStandSn());
                     // 1.1.2.3 获取新的顺序号 存入顺序号表中
-                    saveBussStandSn(reviseStatus, standSort, one.getStandSn(),taskId);
+                    if (StringUtils.isBlank(MaxSn) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
+                        saveBussStandSn(reviseStatus, standSort, one.getStandSn(),taskId);
+                    }
                 }
 
             }
@@ -267,7 +271,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             if(ObjectUtils.isNotEmpty(bussionessStand)){
                 sn = bussionessStand.getNewStandSn();
             }
-            saveBussStandSn(reviseStatus, standSort, sn, taskId);
+            if (StringUtils.isBlank(MaxSn) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
+                saveBussStandSn(reviseStatus, standSort, sn, taskId);
+            }
             bussionessStand.setStandSn(sn);
         }
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml
index fd7c7529..6bedd77a 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml
@@ -8,5 +8,8 @@
     <select id="selectMaxStandSn" resultType="java.lang.String">
         select Max(STAND_SN)  from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0'
     </select>
+    <select id="selectStandSort" resultType="java.lang.String">
+        select STAND_SORT from sar_buss_stand_sn where STAND_SORT = #{standSort} and VALID_FLAG = '0' limit 1
+    </select>
 
 </mapper>
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 80eaffcd..64b18639 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
@@ -351,7 +351,7 @@
     </select>
 
     <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select MAX(DISTINCT CAST(stand_number AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
+        select MAX(DISTINCT CAST(stand_number AS decimal(9))) AS newStandSn from sar_bussioness_stand
         where REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
     </select>