合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!99

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>
@@ -14,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SarBussStandSnDao extends BaseMapper<SarBussStandSn> {
 
     String selectMaxStandnSn();
+
+    String selectMaxStandSn(String standSort);
+
+    String selectStandSort(String standSort);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java

@@ -19,4 +19,7 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
 
     String selectMaxStandnSn();
 
+    String selectMaxStandSn(String standSort);
+
+    String selectStandSort(String standSort);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java

@@ -65,4 +65,14 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
     public String selectMaxStandnSn() {
         return baseMapper.selectMaxStandnSn();
     }
+
+    @Override
+    public String selectMaxStandSn(String standSort) {
+        return baseMapper.selectMaxStandSn(standSort);
+    }
+
+    @Override
+    public String selectStandSort(String standSort) {
+        return baseMapper.selectStandSort(standSort);
+    }
 }

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);
 }
 

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);
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -220,11 +220,14 @@ 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);
+        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);
@@ -248,24 +251,29 @@ 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);
+                    }
                 }
 
             }
         }else {
             // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
             bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
-            String sn = "1";
+            String sn = "001";
             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);
         }
 
@@ -4674,6 +4682,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<>();