From af73b1917e58e37daaa3e63f5303da1056cedfa3 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期四, 13 七月 2023 18:18:26 +0800
Subject: [PATCH] 修复生命周期调试异常,整理流程代码
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
index 7fc3448..ace2a89 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
@@ -106,6 +106,18 @@
return LifeCycleEventWrapper.build().pageVO(eventMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap, LifeCycleEvent.class).lambda().orderByAsc(LifeCycleEvent::getEventFullName)));
}
+ public List<LifeCycleEventVO> listEventNoPage(){
+ QueryWrapper<LifeCycleEvent> queryWrapper = new QueryWrapper();
+ List<LifeCycleEvent> lifeCycleEvents = eventMapper.selectList(queryWrapper);
+ List<LifeCycleEventVO> vos = new ArrayList<>();
+ lifeCycleEvents.stream().forEach(lifeCycleEvent -> {
+ LifeCycleEventVO vo = new LifeCycleEventVO();
+ BeanUtil.convert(lifeCycleEvent,vo);
+ vos.add(vo);
+ });
+ return vos;
+ }
+
/**
* 娣诲姞淇濆瓨
*
@@ -317,9 +329,7 @@
LifeCycleRule rule = selectByOid(lifeCycleDTO.getOid());
//鏌ヨ閲嶅
QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
- if(rule.getId().equals(lifeCycleDTO.getId())){
- throw new VciBaseException("鐢熷懡鍛ㄦ湡缂栧彿涓嶈兘淇敼");
- }
+
wrapper.eq("lower(id)",lifeCycleDTO.getId().toLowerCase(Locale.ROOT));
wrapper.ne("oid",lifeCycleDTO.getOid());
if(baseMapper.selectCount(wrapper)>0){
@@ -336,7 +346,7 @@
String lifeOid = lifeCycleRule.getOid();
QueryWrapper<LifeCycleNode> nodeWrapper = new QueryWrapper<>();
- nodeWrapper.eq("lifeCycleOid",lifeOid.toLowerCase(Locale.ROOT));
+ nodeWrapper.eq("life_cycle_oid",lifeOid.toLowerCase(Locale.ROOT));
List<LifeCycleNode> nodes = nodeMapper.selectList(nodeWrapper);
List<LifeCycleNodeVO> nodeVos = new ArrayList<>();
nodes.stream().forEach(doo->{
@@ -347,7 +357,7 @@
vo.setNodes(nodeVos);
QueryWrapper<LifeCycleEdge> edgeWrapper = new QueryWrapper<>();
- edgeWrapper.eq("lifeCycleOid",lifeOid.toLowerCase(Locale.ROOT));
+ edgeWrapper.eq("life_cycle_oid",lifeOid.toLowerCase(Locale.ROOT));
List<LifeCycleEdge> edges = edgeMapper.selectList(edgeWrapper);
List<LifeCycleEdgeVO> edgeVos = new ArrayList<>();
edges.stream().forEach(doo->{
--
Gitblit v1.9.3