diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java index 03303efc..ad7a3939 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java @@ -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; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/controller/SarBussStandSnController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/controller/SarBussStandSnController.java index b62628d6..e1a54f66 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/controller/SarBussStandSnController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/controller/SarBussStandSnController.java @@ -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 { @Autowired private ISarBussStandSnService iSarBussStandSnService; + @ApiOperation(value = "效验当前顺序号是否存在") + @GetMapping("verifySnExists") + public ResponseMessage 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 modSnByProcess(@RequestParam("taskId") String taskId){ 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 e5d0a58e..76af0a85 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 @@ -13,5 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ISarBussStandSnService extends IService { + Boolean verifySnExists(String taskId,String standSn,String standSort); + Boolean modSnByProcess(String taskId); } 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 797770e2..1ebe3f38 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 @@ -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 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(); 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 68625a7f..cf976fb7 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 @@ -190,11 +190,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl