Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 See merge request LiuChao/foton-slrs-system-rest!549
2022-07-03 18:04:18 +08:00
parent 58fa98fe3a 8b70a4c80d
commit 98d049af2f
6 changed files with 44 additions and 7 deletions
@@ -1,6 +1,8 @@
 package com.adc.da.common;

+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,5 +48,8 @@ public class BusProcessNew {

    private long commitStatus;

+    @TableField( exist = false)
+    @ApiModelProperty(value = "当前节点信息")
+    private String nowTaskInfo;

 }
@@ -24,12 +24,20 @@ import com.adc.da.base.web.BaseController;
 */
@RestController
@Api(tags = "|SarBussStandSn|")
-@RequestMapping("/sarBussStandSn/sar-buss-stand-sn")
+@RequestMapping("/${restPath}/sarBussStandSn/sar-buss-stand-sn")
 public class SarBussStandSnController extends BaseController<SarBussStandSn> {

    @Autowired
    private ISarBussStandSnService iSarBussStandSnService;

+    @ApiOperation(value = "效验当前顺序号是否存在")
+    @GetMapping("verifySnExists")
+    public ResponseMessage<Object> verifySnExists(@RequestParam("taskId") String taskId,@RequestParam("standSn") String standSn,@RequestParam("standSort") String standSort){
+        synchronized (this){
+            return Result.success(iSarBussStandSnService.verifySnExists(taskId,standSn,standSort));
+        }
+    }
+
    @ApiOperation(value = "更新企标顺序号状态")
    @GetMapping("modSnByProcess")
    public ResponseMessage<Object> modSnByProcess(@RequestParam("taskId") String taskId){
@@ -13,5 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface ISarBussStandSnService extends IService<SarBussStandSn> {

+    Boolean verifySnExists(String taskId,String standSn,String standSort);
+
    Boolean modSnByProcess(String taskId);
 }
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussStandSn.service.impl;
 import com.adc.da.slrs.sarBussStandSn.entity.SarBussStandSn;
 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.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +24,27 @@ public class SarBussStandSnServiceImpl extends ServiceImpl<SarBussStandSnDao, Sa
    @Autowired
    private ISarBussStandSnService iSarBussStandSnService;

+    @Autowired
+    private ISarBussionessStandService iSarBussionessStandService;
+
+    @Override
+    public Boolean verifySnExists(String taskId,String standSn,String standSort){
+        QueryWrapper<SarBussStandSn> qw = new QueryWrapper();
+        qw.eq("STAND_SORT",standSort);
+        qw.eq("STAND_SN",standSn);
+        qw.and(wrapper -> wrapper.ne("TASK_ID",taskId).or().isNull("TASK_ID"));
+        int count = iSarBussStandSnService.count(qw);
+        QueryWrapper qw2 = new QueryWrapper();
+        qw2.eq("STAND_SORT",standSort);
+        qw2.eq("STAND_NUMBER",standSn);
+        int count2 = iSarBussionessStandService.count(qw2);
+        if(count > 0 || count2 > 0){
+            return false;
+        }
+
+        return true;
+    }
+
    @Override
    public Boolean modSnByProcess(String taskId){
        QueryWrapper qw = new QueryWrapper();
@@ -190,11 +190,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                QueryWrapper wrapper = new QueryWrapper();
                wrapper.select("MIN(DISTINCT CAST(STAND_SN AS decimal(9))) AS STAND_SN");
                wrapper.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
-                qw.isNull("TASK_ID");
-                qw.eq("USE_STATUS","no");
+                wrapper.isNull("TASK_ID");
+                wrapper.eq("USE_STATUS","no");
                SarBussStandSn standSn = iSarBussStandSnService.getOne(wrapper);
                // 1.1.2 查询 被撤回的 任务ID 被重置NULL 及 状态被重置 no 未使用 最小值 。。 "自动带入"  "自动获取"  未被使用最小 顺序号
-                if(standSn.getId() != null) {
+                if(standSn != null && standSn.getId() != null) {
                    // 1.1.2.1 返回顺序号
                    bussionessStand.setNewStandSn(standSn.getStandSn());
                }else {
@@ -202,7 +202,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                    QueryWrapper wrapper1 = new QueryWrapper();
                    wrapper1.select("MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS STAND_SN");
                    wrapper1.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ",""));
-                    SarBussStandSn one = iSarBussStandSnService.getOne(wrapper);
+                    SarBussStandSn one = iSarBussStandSnService.getOne(wrapper1);
                    // 1.1.2.2 返回顺序号
                    bussionessStand.setNewStandSn(one.getStandSn());
                    // 1.1.2.3 获取新的顺序号 存入顺序号表中
@@ -213,7 +213,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
        }else {
            // 2 获取企标库中 当前类别 最新 顺序号 （前提必须顺序号为正规数据）
            bussionessStand = sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus,standSort);
-            saveBussStandSn(reviseStatus, standSort, bussionessStand.getStandSn(),taskId);
+            saveBussStandSn(reviseStatus, standSort, bussionessStand.getNewStandSn(),taskId);
        }

        return bussionessStand;
@@ -351,7 +351,7 @@
    </select>

    <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
+        select MAX(DISTINCT CAST(stand_number AS decimal(9)))+1 AS newStandSn from sar_bussioness_stand
        where REPLACE(STAND_SORT,' ','') = REPLACE(#{standSort},' ','') and valid_flag=0
    </select>