From bab515e6ecfb16c042d455fdd2f042b2fd277dda Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 11 十月 2023 00:43:11 +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 | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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..7d61250 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
@@ -4,14 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.omd.constant.BtmTypeConstant;
+import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
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.*;
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;
@@ -81,7 +80,8 @@
@Resource
private LifeCycleEventMapper eventMapper;
-
+ @Resource
+ private LifeCycleMapper lifeCycleMapper;
/**
* 鑾峰彇鐢熷懡鍛ㄦ湡鍒楄〃
*
@@ -104,6 +104,18 @@
@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)));
+ }
+
+ 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;
}
/**
@@ -316,13 +328,15 @@
lifeCycleDTO.getOid(),"涓婚敭");
LifeCycleRule rule = selectByOid(lifeCycleDTO.getOid());
//鏌ヨ閲嶅
- QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
- if(rule.getId().equals(lifeCycleDTO.getId())){
- throw new VciBaseException("鐢熷懡鍛ㄦ湡缂栧彿涓嶈兘淇敼");
- }
+
+ String sql="select * from pl_omd_life_cycle_rule where lower(id)=? and oid != ?";
+ /*QueryWrapper wrapper = new QueryWrapper(LifeCycleRule.class);
wrapper.eq("lower(id)",lifeCycleDTO.getId().toLowerCase(Locale.ROOT));
wrapper.ne("oid",lifeCycleDTO.getOid());
if(baseMapper.selectCount(wrapper)>0){
+ throw new VciBaseException("鐢熷懡鍛ㄦ湡鐨勭紪鍙蜂笉鑳介噸澶�");
+ }*/
+ if(lifeCycleMapper.checkIdExist(lifeCycleDTO.getId().toLowerCase(Locale.ROOT),lifeCycleDTO.getOid())>0){
throw new VciBaseException("鐢熷懡鍛ㄦ湡鐨勭紪鍙蜂笉鑳介噸澶�");
}
editLifeCycle(lifeCycleDTO,rule);
@@ -336,7 +350,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 +361,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