bug:企标编号重复问题处理

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/controller/SarBussStandSnController.java

@@ -38,7 +38,7 @@ public class SarBussStandSnController extends BaseController<SarBussStandSn> {
         }
     }
 
-    @ApiOperation(value = "更新企标顺序号状态")
+    @ApiOperation(value = "逻辑删除企标顺序号状态")
     @GetMapping("modSnByProcess")
     public ResponseMessage<Object> modSnByProcess(@RequestParam("taskId") String taskId){
         return Result.success(iSarBussStandSnService.modSnByProcess(taskId));

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

@@ -17,6 +17,8 @@ public interface ISarBussStandSnService extends IService<SarBussStandSn> {
 
     Boolean modSnByProcess(String taskId);
 
+    Boolean modSnByStandSortAndSn(String standSort, String standSn);
+
     String selectMaxStandnSn();
 
     String selectMaxStandSn(String standSort);

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

@@ -5,11 +5,15 @@ import com.adc.da.slrs.sarBussStandSn.dao.SarBussStandSnDao;
 import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  * 企业标准信息表 服务实现类
@@ -47,11 +51,11 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
 
     @Override
     public Boolean modSnByProcess(String taskId){
-        QueryWrapper qw = new QueryWrapper();
+        QueryWrapper<SarBussStandSn> qw = new QueryWrapper<>();
         qw.eq("TASK_ID",taskId);
         int count = iSarBussStandSnService.count(qw);
         if(count > 0){
-            UpdateWrapper updateWrapper = new UpdateWrapper();
+            UpdateWrapper<SarBussStandSn> updateWrapper = new UpdateWrapper<>();
             updateWrapper.set("USE_STATUS","no");
             updateWrapper.set("TASK_ID",null);
             updateWrapper.eq("TASK_ID",taskId);
@@ -61,6 +65,20 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
         return false;
     }
 
+    @Override
+    public Boolean modSnByStandSortAndSn(String standSort, String standSn) {
+        LambdaUpdateWrapper<SarBussStandSn> wrapper = new LambdaUpdateWrapper<>();
+        if (StringUtils.isBlank(standSn) || StringUtils.isBlank(standSort)) {
+            return false;
+        }
+        wrapper.set(SarBussStandSn::getUseStatus,"no");
+        wrapper.set(SarBussStandSn::getValidFlag,"1");
+        wrapper.set(SarBussStandSn::getModifyTime,new Date());
+        wrapper.eq(SarBussStandSn::getStandSn,standSn);
+        wrapper.eq(SarBussStandSn::getStandSort,standSort);
+        return iSarBussStandSnService.update(wrapper);
+    }
+
     @Override
     public String selectMaxStandnSn() {
         return baseMapper.selectMaxStandnSn();

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -120,9 +120,9 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
     @GetMapping("/getStandInfoByReviseStatus")
     //@RequiresPermissions("lawss:sarStandardsInfo:get")
-    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId) {
+    public ResponseMessage<String> getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId) {
         synchronized (this){
-            SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort,taskId);
+            String result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort,taskId);
             return Result.success(result);
         }
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -39,7 +39,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
     List<SarBussionessStand> queryByBussStateSync(SarBussionessStand sarBussionessStand);
 
-    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort);
+    String getStandInfoByReviseStatus(String reviseStatus,String standSort);
 
     SarBussionessStand selectByPrimaryKey(String standId);
 

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

@@ -22,7 +22,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
 
     void updateCiteStand(SarBussionessStand sarBussionessStandEO, SarBussionessStand beforeSarStandardsInfo, String upField, String beUpedField);
 
-    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId);
+    String getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId);
 
     void attrInfoDetails (SarBussionessStand row) throws Exception;
 

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

@@ -69,6 +69,7 @@ import com.adc.da.utils.util.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
 import org.apache.commons.beanutils.BeanUtils;
@@ -88,6 +89,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.sql.Clob;
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -223,68 +225,60 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     private OnlineFileLogDao onlineFileLogDao;
 
     @Override
-    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
+    public String getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
-        SarBussionessStand bussionessStand = new SarBussionessStand();
+        DecimalFormat decimalFormat = new DecimalFormat("000");
-        String snStandSort = iSarBussStandSnService.selectStandSort(standSort);
+        QueryWrapper<SarBussStandSn> queryWrapper = new QueryWrapper<>();
-        QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+        queryWrapper.eq("USE_STATUS","yes");
+        queryWrapper.eq("VALID_FLAG","0");
         int count = iSarBussStandSnService.count(queryWrapper);
-        String MaxSn = iSarBussStandSnService.selectMaxStandSn(standSort);
+        // 1 先验证 顺序表中是否存在当前企标类别
-        String standMaxSn = iSarBussionessStandService.selectMaxStandSn(standSort);
+        if(count == 0){
-        // 1 先验证 当前企标类别 是否存在顺序号
+            // 企标顺序表中 不存在该类别
-        if(count > 0 && MaxSn.equals(standMaxSn)){
+            // 从企标库中获取最新的企标编号
-            QueryWrapper qw = new QueryWrapper();
+            String standMaxSn = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
-            qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
+            String newMaxSn;
-            qw.eq("TASK_ID",taskId);
+            if(StringUtils.isBlank(standMaxSn)){
-            qw.eq("USE_STATUS","yes");
+                newMaxSn = "001";
-            SarBussStandSn sns = iSarBussStandSnService.getOne(qw);
+                saveBussStandSn(reviseStatus,standSort,newMaxSn,taskId);
-            // 1.1 防止不同步撤回 页面未退出 及 防止页面刷新 已锁定的顺序号 被一直叠加 获取当前任务之前生成的顺序号
+                return newMaxSn;
-            if(sns != null && sns.getId() != null){
-                // 1.1.1 返回顺序号
-                bussionessStand.setNewStandSn(sns.getStandSn());
-            }else {
-                QueryWrapper wrapper = new QueryWrapper();
-                wrapper.select("MIN(DISTINCT CAST(STAND_SN AS decimal(9))) AS STAND_SN");
-                wrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
-                wrapper.isNull("TASK_ID");
-                wrapper.eq("USE_STATUS","no");
-                SarBussStandSn standSn = iSarBussStandSnService.getOne(wrapper);
-                // 1.1.2 查询 被撤回的 任务ID 被重置NULL 及 状态被重置 no 未使用 最小值 。。 "自动带入"  "自动获取"  未被使用最小 顺序号
-                if(standSn != null && standSn.getId() != null) {
-                    // 1.1.2.1 返回顺序号
-                    bussionessStand.setNewStandSn(standSn.getStandSn());
-                }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))) 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 获取新的顺序号 存入顺序号表中
-                    if (StringUtils.isBlank(MaxSn) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
-                        saveBussStandSn(reviseStatus, standSort, one.getStandSn(),taskId);
-                    }
-                }
-
             }
-        }else {
+            newMaxSn = decimalFormat.format(Integer.parseInt(standMaxSn) + 1);
-            // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
+            saveBussStandSn(reviseStatus, standSort, newMaxSn, taskId);
-            bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
+            return newMaxSn;
-            String sn = "001";
-            if(ObjectUtils.isNotEmpty(bussionessStand)){
-                sn = bussionessStand.getNewStandSn();
-            }
-            if ((StringUtils.isBlank(MaxSn) || !MaxSn.equals(standMaxSn)) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
-                saveBussStandSn(reviseStatus, standSort, sn, taskId);
-            }
-            bussionessStand.setStandSn(sn);
         }
-
+        // 若存在 则添加返回 最大企标顺序号+1
-        return bussionessStand;
+        // 查询是否已经已有记录
+        queryWrapper.eq("TASK_ID",taskId);
+        queryWrapper.orderByDesc("MODIFY_TIME");
+        List<SarBussStandSn> snsList = iSarBussStandSnService.list(queryWrapper);
+        // 1.1 防止不同步撤回 页面未退出 及 防止页面刷新 已锁定的顺序号 被一直叠加 获取当前任务之前生成的顺序号
+        if(!snsList.isEmpty()){
+            // 1.1.1 返回顺序号
+            if (snsList.get(0).getStandSn() != null) {
+                return snsList.get(0).getStandSn();
+            }
+        }
+        // 没有已存在的记录，则生成新的顺序号返回
+        String maxStandSn = iSarBussStandSnService.selectMaxStandSn(standSort);
+        // 处理顺序号的格式
+        if (count >= 1000) {
+            StringBuilder formatBuilder = new StringBuilder();
+            for (int i = 0; i < maxStandSn.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);
+        // 1.1.2.3 新的顺序号 存入顺序号表中
+        saveBussStandSn(reviseStatus, standSort, newStandSn, taskId);
+        // 返回顺序号
+        return newStandSn;
     }
 
+    // 保存顺序号到顺序号表
     private void saveBussStandSn(String reviseStatus, String standSort, String standSn,String taskId) {
         SarBussStandSn sn = new SarBussStandSn();
         sn.setId(UUIDUtils.randomUUID20());
@@ -296,6 +290,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         iSarBussStandSnService.saveOrUpdate(sn);
     }
 
+    @Override
     public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {
         SarBussionessStand sarStandardsInfoEO = new SarBussionessStand();
         sarStandardsInfoEO.setValidFlag(1);
@@ -316,6 +311,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 //            personShareEODao.deleteByResId(id);
             //删除标准关联的value表
             sarBussStandValEODao.deleteDataByStandId(id);
+            // 删除企标顺序号表
+            SarBussionessStand sarBussionessStand = sarBussionessStandEODao.selectById(id);
+            if (sarBussionessStand != null && sarBussionessStand.getStandSort() != null && sarBussionessStand.getStandSn() != null){
+                iSarBussStandSnService.modSnByStandSortAndSn(sarBussionessStand.getStandSort(),sarBussionessStand.getStandSn());
+            }
             //删除企标复审计划
             QueryWrapper<SarBussionessStandState> objectQueryWrapper = new QueryWrapper<>();
             objectQueryWrapper.eq("STAND_ID",id);
@@ -1861,6 +1861,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return resultMap;
     }
 
+    @Override
     public void attrInfoDetails (SarBussionessStand row) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryFieldBuss;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml

@@ -6,7 +6,7 @@
      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 Max(STAND_SN)  from sar_buss_stand_sn where STAND_SORT = #{standSort} and USE_STATUS = 'yes' 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

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -350,7 +350,7 @@
 
     </select>
 
-    <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
+    <select id="getStandInfoByReviseStatus" resultType="String" parameterType="java.lang.String">
         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>