From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 d87ce3d..44f6615 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
@@ -17,6 +17,7 @@
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import io.undertow.servlet.core.Lifecycle;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -44,6 +45,8 @@
private BtmTypeMapper btmTypeMapper;
@Resource
private LifeCycleNodeMapper lifeCycleNodeMapper;
+ @Resource
+ private LifeCycleMapper lifeCycleMapper;
/**
* 鑾峰彇鐘舵�佸垪琛�
*
@@ -413,9 +416,10 @@
throw new VciBaseException("瑕佸垹闄ょ殑鐘舵�佸璞′笉鑳戒负绌�");
}
Set<String> oidSet= new HashSet<>();
+ Set<String> idSet= new HashSet<>();
statusVOList.stream().forEach( s -> {
VciBaseUtil.alertNotNull(s.getOid(),"瑕佸垹闄ょ殑鐘舵�佸璞＄殑涓婚敭");
- oidSet.add(s.getOid());
+ idSet.add(s.getId());
});
//鏌ヨ
List<Status> statusDOList = listStatusByOidCollectionDO(oidSet);
@@ -429,7 +433,7 @@
}
});
//妫�鏌ュ睘鎬ф槸鍚﹁寮曠敤
- if(checkStatusUseds(oidSet)){
+ if(checkStatusUseds(idSet)){
throw new VciBaseException("瑕佸垹闄ょ殑鐘舵�佸湪鐢熷懡鍛ㄦ湡瀵硅薄涓浣跨敤锛屾棤娉曞垹闄�");
}
Collection<Collection<String>> oidCollections = VciBaseUtil.switchCollectionForOracleIn(oidInDbSet);
@@ -446,6 +450,10 @@
*/
@Override
public boolean checkStatusUseds(Collection<String> oidCollection) {
+ Long count = lifeCycleNodeMapper.selectCount(Wrappers.<LifeCycleNode>query().lambda().in(LifeCycleNode::getId,oidCollection));
+ if(count>0){
+ return true;
+ }
return false;
}
@@ -458,6 +466,7 @@
*/
@Override
public boolean checkStatusUsed(String pkStatus) throws VciBaseException {
+
return false;
}
@@ -469,12 +478,20 @@
*/
@Override
public List<BtmTypeVO> getApplyRange(String id) {
+ List<BtmTypeVO> btmTypeVOS=new ArrayList<>();
VciBaseUtil.alertNotNull(id,"鐘舵�佽嫳鏂囧悕绉�");
List<LifeCycleNode> selectList = lifeCycleNodeMapper.selectList(Wrappers.<LifeCycleNode>query().lambda().eq(LifeCycleNode::getId,id));
List<String>lifeCycleOidList = new ArrayList<>();
if(!CollectionUtils.isEmpty(selectList)){
lifeCycleOidList = selectList.stream().map(LifeCycleNode::getLifeCycleOid).collect(Collectors.toList());
+ List<LifeCycleRule>LifeCycleRuleList = lifeCycleMapper.selectList(Wrappers.<LifeCycleRule>query().lambda().in(LifeCycleRule::getOid,lifeCycleOidList));
+ List<String>lifeCycleRuleIdList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(LifeCycleRuleList)) {
+ lifeCycleRuleIdList = LifeCycleRuleList.stream().map(LifeCycleRule::getId).collect(Collectors.toList());
+ btmTypeVOS= BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().in(BtmType::getLifeCycleId, lifeCycleRuleIdList)));
+ }
}
- return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().in(BtmType::getOid,lifeCycleOidList)));
+
+ return btmTypeVOS;
}
}
--
Gitblit v1.9.3