From 016b3630bd5939563a2182cbf6bdc564ae210da8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 13 十月 2023 11:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
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 0999276..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
@@ -1,14 +1,22 @@
package com.vci.ubcs.omd.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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;
@@ -21,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;
@@ -35,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;
/**
* 鑾峰彇鐘舵�佸垪琛�
*
@@ -196,7 +208,10 @@
Collection<Collection<String>> idCollections = VciBaseUtil.switchCollectionForOracleIn(idCollection);
if(!CollectionUtils.isEmpty(idCollections)) {
idCollections.forEach(s -> {
- List<Status> queryResult = baseMapper.selectByIdIgnoreCase(s);
+ QueryWrapper<Status> wrapper = new QueryWrapper<>();
+ wrapper.in("id",s);
+ List<Status> queryResult = baseMapper.selectList(wrapper);
+
if(!CollectionUtils.isEmpty(queryResult)){
statusDOList.addAll(queryResult);
}
@@ -449,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