From a3ee02d1abc58c9a0c8cfc55e384a17fcb850196 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期五, 13 十月 2023 11:04:53 +0800 Subject: [PATCH] 状态使用范围接口开发 --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java | 12 ++++++++++++ Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 25 ++++++++++++++++++++++++- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java | 9 ++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java index 63b2ce0..d1e6b8c 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java @@ -102,4 +102,16 @@ statusService.batchDelete(StatusVOList); return R.status(true); } + + /** + * 鏌ョ湅浣跨敤鑼冨洿 + * @param id 鐗堟湰瑙勫垯id + * @return 鎵ц缁撴灉 + */ + @GetMapping("/get-apply-range") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "鐗堟湰瑙勫垯id",notes = "浼犲叆id") + public R getApplyRange(String id){ + return R.data(statusService.getApplyRange(id)); + } } diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java index b8ad564..a8a97e6 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java @@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.entity.Status; +import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.omd.vo.StatusVO; import com.vci.ubcs.starter.exception.VciBaseException; import org.springblade.core.mp.support.Query; @@ -160,5 +162,10 @@ * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呮煡璇㈠嚭閿欐椂浼氭姏鍑洪敊璇� */ boolean checkStatusUsed(String pkStatus) throws VciBaseException; - + /** + * 鏌ョ湅搴旂敤鑼冨洿 + * @param id id + * @return 鎵ц缁撴灉 + */ + List<BtmTypeVO> getApplyRange(String id); } diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java index c297a3c..6f02fd1 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java @@ -6,11 +6,17 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.omd.constant.BtmTypeConstant; +import com.vci.ubcs.omd.entity.BtmType; import com.vci.ubcs.omd.entity.LifeCycleRule; import com.vci.ubcs.omd.entity.Status; +import com.vci.ubcs.omd.mapper.BtmTypeMapper; +import com.vci.ubcs.omd.mapper.LifeCycleMapper; import com.vci.ubcs.omd.mapper.StatusMapper; import com.vci.ubcs.omd.service.IStatusService; +import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.omd.vo.StatusVO; +import com.vci.ubcs.omd.wrapper.BtmTypeWrapper; +import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper; import com.vci.ubcs.omd.wrapper.StatusWrapper; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.web.util.BeanUtil; @@ -23,6 +29,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.util.*; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -37,7 +44,10 @@ public class StatusServiceImpl extends ServiceImpl<StatusMapper, Status> implements IStatusService { private final String REGEXP = "^[A-Za-z]+$"; - + @Resource + private BtmTypeMapper btmTypeMapper; + @Resource + private LifeCycleMapper lifeCycleMapper; /** * 鑾峰彇鐘舵�佸垪琛� * @@ -454,4 +464,17 @@ public boolean checkStatusUsed(String pkStatus) throws VciBaseException { return false; } + + /** + * 鏌ョ湅搴旂敤鑼冨洿 + * + * @param id id + * @return 鎵ц缁撴灉 + */ + @Override + public List<BtmTypeVO> getApplyRange(String id) { + VciBaseUtil.alertNotNull(id,"鐘舵�佽嫳鏂囧悕绉�"); + //lifeCycleMapper.selectList(Wrappers.<LifeCycleRule>query().lambda().eq(LifeCycleRule::getStartStatus,id)); + return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().eq(BtmType::getRevisionRuleId,id))); + } } -- Gitblit v1.9.3