From b7f7e952f29acd12f454942ccf21bd59ebedf5d5 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Tue, 6 Jun 2023 11:33:36 +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

---
 .../da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java |  2 ++
 .../service/ISarBussStandSnService.java               |  1 +
 .../service/impl/SarBussStandSnServiceImpl.java       |  5 +++++
 .../sarBussionessStand/dao/SarBussionessStandDao.java |  2 ++
 .../service/ISarBussionessStandService.java           |  2 ++
 .../service/impl/SarBussionessStandServiceImpl.java   | 11 +++++++++--
 .../mapper/sarBussStandSn/SarBussStandSnMapper.xml    |  3 +++
 .../sarBussionessStand/SarBussionessStandMapper.xml   |  3 +++
 8 files changed, 27 insertions(+), 2 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 aaa86294..717bd587 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
@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
 
     String selectMaxStandnSn();
+
+    String selectMaxStandSn(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 c61e0c37..237e6461 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
@@ -19,4 +19,5 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
 
     String selectMaxStandnSn();
 
+    String selectMaxStandSn(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 f55ac7c4..39f9b3a3 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
@@ -65,4 +65,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
     public String selectMaxStandnSn() {
         return baseMapper.selectMaxStandnSn();
     }
+
+    @Override
+    public String selectMaxStandSn(String standSort) {
+        return baseMapper.selectMaxStandSn(standSort);
+    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
index 65b42273..0c4794f7 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
@@ -136,5 +136,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
     @Select("select * from sar_bussioness_stand where TEXT_STATUS_BUSS is not null")
     List<SarBussionessStand> selectAllStandStatus();
+
+    String selectMaxStandSn(String 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 98dcdb08..cb89c2ab 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
@@ -70,5 +70,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
     ResponseMessage cleaningDataReview();
 
     ResponseMessage repeal(String id, String type);
+
+    String selectMaxStandSn(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 8442b060..b33089b6 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
@@ -223,8 +223,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
         int count = iSarBussStandSnService.count(queryWrapper);
+        String MaxSn = iSarBussStandSnService.selectMaxStandSn(standSort);
+        String standMaxSn = iSarBussionessStandService.selectMaxStandSn(standSort);
         // 1 先验证 当前企标类别 是否存在顺序号
-        if(count > 0){
+        if(count > 0 && MaxSn.equals(standMaxSn)){
             QueryWrapper qw = new QueryWrapper();
             qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
             qw.eq("TASK_ID",taskId);
@@ -261,7 +263,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         }else {
             // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
             bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
-            String sn = "1";
+            String sn = "001";
             if(ObjectUtils.isNotEmpty(bussionessStand)){
                 sn = bussionessStand.getNewStandSn();
             }
@@ -4674,6 +4676,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return Result.success();
     }
 
+    @Override
+    public String selectMaxStandSn(String standSort) {
+        return baseMapper.selectMaxStandSn(standSort);
+    }
+
     public String updateInfo(List<String> asList,String standId,String attfId) {
         //重复的集合
         List<AttFileEO> chongfu = new ArrayList<>();
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 8018e2e0..fd7c7529 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
@@ -5,5 +5,8 @@
     <select id="selectMaxStandnSn" resultType="java.lang.String">
      select Max(STAND_SN)  from sar_buss_stand_sn
     </select>
+    <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>
 
 </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 5f2e9f67..80eaffcd 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
@@ -1257,6 +1257,9 @@
             resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
         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>
 
     <update id="updateByIdInfo" >
         update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}