From 4d8f8ea304c739da4da6af2448b2957785f3d561 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期四, 06 七月 2023 20:23:59 +0800
Subject: [PATCH] 增加生命周期的事件列表
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 bd1f599..f2f24e2 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
@@ -9,21 +9,17 @@
import com.vci.ubcs.omd.dto.LifeCycleEdgeDTO;
import com.vci.ubcs.omd.dto.LifeCycleLineEventDTO;
import com.vci.ubcs.omd.dto.LifeCycleNodeDTO;
-import com.vci.ubcs.omd.entity.LifeCycleEdge;
-import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
-import com.vci.ubcs.omd.entity.LifeCycleNode;
-import com.vci.ubcs.omd.entity.LifeCycleRule;
-import com.vci.ubcs.omd.mapper.LifeCycleEdgeMapper;
-import com.vci.ubcs.omd.mapper.LifeCycleLineEventMapper;
-import com.vci.ubcs.omd.mapper.LifeCycleMapper;
-import com.vci.ubcs.omd.mapper.LifeCycleNodeMapper;
+import com.vci.ubcs.omd.entity.*;
+import com.vci.ubcs.omd.mapper.*;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.IBtmTypeService;
import com.vci.ubcs.omd.service.ILifeCycleService;
import com.vci.ubcs.omd.service.IStatusService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleEventVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.vo.StatusVO;
+import com.vci.ubcs.omd.wrapper.LifeCycleEventWrapper;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.enumpack.NewAppConstantEnum;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -85,6 +81,9 @@
@Lazy
private IBtmTypeService btmTypeService;
+ @Resource
+ private LifeCycleEventMapper eventMapper;
+
/**
* 鑾峰彇鐢熷懡鍛ㄦ湡鍒楄〃
@@ -96,6 +95,18 @@
@Override
public IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query) {
return LifeCycleRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap,LifeCycleRule.class).lambda().orderByAsc(LifeCycleRule::getId)));
+ }
+
+ /**
+ * 鑾峰彇鍏ㄩ儴鐨勪簨浠�
+ *
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @param query 鍒嗛〉
+ * @return 浜嬩欢鐨勬樉绀哄璞�
+ */
+ @Override
+ public IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query) {
+ return LifeCycleEventWrapper.build().pageVO(eventMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(conditionMap, LifeCycleEvent.class).lambda().orderByAsc(LifeCycleEvent::getEventFullName)));
}
/**
@@ -132,8 +143,6 @@
life.setOid(VciBaseUtil.getPk());
String creator = AuthUtil.getUserAccount();
Date now = new Date();
- life.setBtmname(BtmTypeConstant.LIFE_CYCLE);
- life.setOwner(creator);
life.setCreator(creator);
life.setCreateTime(now);
life.setLastModifier(creator);
@@ -197,8 +206,6 @@
LifeCycleLineEvent event = org.springblade.core.tool.utils.BeanUtil.copy(eventDTO, LifeCycleLineEvent.class);
event.setOid(VciBaseUtil.getPk());
event.setPkLifeCycleEdge(edgeOid);
- event.setBtmname(BtmTypeConstant.LIFE_CYCLE_LINE_EVENT);
- event.setOwner(creator);
event.setCreator(creator);
event.setCreateTime(now);
event.setLastModifier(creator);
@@ -219,8 +226,6 @@
LifeCycleNode node = org.springblade.core.tool.utils.BeanUtil.copy(nodeDTO, LifeCycleNode.class);
node.setOid(VciBaseUtil.getPk());
node.setLifeCycleOid(lifeOid);
- node.setBtmname(BtmTypeConstant.LIFE_CYCLE_NODE);
- node.setOwner(creator);
node.setCreator(creator);
node.setCreateTime(now);
node.setLastModifier(creator);
@@ -247,8 +252,6 @@
LifeCycleEdge edge = org.springblade.core.tool.utils.BeanUtil.copy(edgeDTO, LifeCycleEdge.class);
edge.setOid(VciBaseUtil.getPk());
edge.setLifeCycleOid(lifeOid);
- edge.setBtmname(BtmTypeConstant.LIFE_CYCLE_EDGE);
- edge.setOwner(creator);
edge.setCreator(creator);
edge.setCreateTime(now);
edge.setLastModifier(creator);
--
Gitblit v1.9.3