From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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 f2f24e2..7fc3448 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
@@ -15,10 +15,7 @@
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.vo.*;
import com.vci.ubcs.omd.wrapper.LifeCycleEventWrapper;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.enumpack.NewAppConstantEnum;
@@ -120,8 +117,8 @@
public LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO) {
VciBaseUtil.alertNotNull(lifeCycleDTO,"鐢熷懡鍛ㄦ湡淇℃伅",lifeCycleDTO.getId(),"鐢熷懡鍛ㄦ湡鐨勭紪鍙�",lifeCycleDTO.getName(),"鐢熷懡鍛ㄦ湡鍚嶇О",lifeCycleDTO.getNodes(),"鐢熷懡鍛ㄦ湡鐨勮妭鐐�",lifeCycleDTO.getStartStatus(),"璧峰鐘舵��");
//鍏堟煡璇㈡槸鍚﹀瓨鍦�
- QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
- wrapper.eq("lower(id)",lifeCycleDTO.getId().toLowerCase(Locale.ROOT));
+ QueryWrapper<LifeCycleRule> wrapper = new QueryWrapper<>();
+ wrapper.eq("id",lifeCycleDTO.getId().toLowerCase(Locale.ROOT));
if(baseMapper.selectCount(wrapper)>0){
throw new VciBaseException("鐢熷懡鍛ㄦ湡鐨勭紪鍙蜂笉鑳介噸澶�");
}
@@ -244,7 +241,7 @@
* @return 杩炴帴绾跨殑涓婚敭
*/
private String addLifeCycleEdge(LifeCycleEdgeDTO edgeDTO,List<String> statusList,String lifeOid,String creator,Date now){
- VciBaseUtil.alertNotNull(edgeDTO.getSource(),"鏉ユ簮鐘舵��",edgeDTO.getTarget(),"鐩爣鐘舵��",edgeDTO.getName(),"杩炴帴绾垮悕绉�");
+ VciBaseUtil.alertNotNull(edgeDTO.getSource(),"鏉ユ簮鐘舵��",edgeDTO.getTarget(),"鐩爣鐘舵��");
if(!statusList.contains(edgeDTO.getSource())
||!statusList.contains(edgeDTO.getTarget())){
throw new VciBaseException("鏁版嵁閿欒锛孾" + edgeDTO.getName() + "]杩炴帴绾夸笂涓娇鐢ㄧ殑鐘舵�佹病鏈夋壘鍒�");
@@ -332,6 +329,36 @@
return LifeCycleRuleWrapper.build().entityVO(getById(rule.getOid()));
}
+ public LifeCycleVO detail(LifeCycleDTO lifeCycleDTO){
+ QueryWrapper wrapper = Condition.getQueryWrapper(org.springblade.core.tool.utils.BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class));
+ LifeCycleRule lifeCycleRule = baseMapper.selectOne(wrapper);
+ LifeCycleVO vo = LifeCycleRuleWrapper.build().entityVO(lifeCycleRule);
+ String lifeOid = lifeCycleRule.getOid();
+
+ QueryWrapper<LifeCycleNode> nodeWrapper = new QueryWrapper<>();
+ nodeWrapper.eq("lifeCycleOid",lifeOid.toLowerCase(Locale.ROOT));
+ List<LifeCycleNode> nodes = nodeMapper.selectList(nodeWrapper);
+ List<LifeCycleNodeVO> nodeVos = new ArrayList<>();
+ nodes.stream().forEach(doo->{
+ LifeCycleNodeVO vo1 = new LifeCycleNodeVO();
+ BeanUtil.convert(doo,vo1);
+ nodeVos.add(vo1);
+ });
+ vo.setNodes(nodeVos);
+
+ QueryWrapper<LifeCycleEdge> edgeWrapper = new QueryWrapper<>();
+ edgeWrapper.eq("lifeCycleOid",lifeOid.toLowerCase(Locale.ROOT));
+ List<LifeCycleEdge> edges = edgeMapper.selectList(edgeWrapper);
+ List<LifeCycleEdgeVO> edgeVos = new ArrayList<>();
+ edges.stream().forEach(doo->{
+ LifeCycleEdgeVO vo2 = new LifeCycleEdgeVO();
+ BeanUtil.convert(doo,vo2);
+ edgeVos.add(vo2);
+ });
+ vo.setEdges(edgeVos);
+
+ return vo;
+ }
/**
* 淇敼鐢熷懡鍛ㄦ湡
* @param lifeCycleDTO
--
Gitblit v1.9.3