From 9c5ac8c682b95106408012b40b01e5131cd37484 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期三, 05 七月 2023 17:25:00 +0800
Subject: [PATCH] 业务类型的定义
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java | 10 ++++++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java | 7 +++++++
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 15 ++++++++++++++-
3 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
index 59145dd..659a53a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeConstant.java
@@ -54,6 +54,16 @@
public static final String LIFE_CYCLE_EVENT = "lifeCycleEvent";
/**
+ * 鐢熷懡鍛ㄦ湡鐨勮妭鐐�
+ */
+ public static final String LIFE_CYCLE_NODE = "lifeCycleNode";
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鐨勮繛鎺ョ嚎淇℃伅
+ */
+ public static final String LIFE_CYCLE_EDGE = "lifeCycleEdge";
+
+ /**
* 鐢熷懡鍛ㄦ湡杩炴帴绾跨殑涓氬姟绫诲瀷鍚嶇О
*/
public static final String LIFE_CYCLE_LINE = "lifeCycleLine";
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
index 780a0c2..b833bf9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/BaseQueryObject.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.springblade.core.mp.support.Query;
import java.io.Serializable;
import java.util.HashMap;
@@ -103,10 +104,15 @@
this.limit = limit;
}
+ /**
+ * 浠庝互鍓嶇殑椤圭洰鎷疯礉杩囨潵鐨勫垎椤�
+ * @return
+ */
@JSONField(
serialize = false,
deserialize = false
)
+ @Deprecated
public PageHelper getPageHelper() {
PageHelper pageHelper = new PageHelper(this.limit);
pageHelper.setPage(this.getPage());
@@ -115,6 +121,7 @@
return pageHelper;
}
+
public BaseQueryObject addSort(String sort, String order) {
this.setSort(StringUtils.isBlank(this.getSort()) ? sort : this.getSort() + "," + sort);
this.setOrder(StringUtils.isBlank(this.getOrder()) ? order : this.getOrder() + "," + order);
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 f731a5d..62db19e 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
@@ -309,6 +309,7 @@
* @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
*/
@Override
+ @Transactional
public void delete(LifeCycleDTO lifeCycleDTO) {
VciBaseUtil.alertNotNull(lifeCycleDTO,"鏁版嵁浼犺緭瀵硅薄",lifeCycleDTO.getOid(),"涓婚敭");
LifeCycleRule rule = null;
@@ -320,8 +321,20 @@
//妫�鏌ヨ寮曠敤涓嶈兘鍒犻櫎
Integer count = btmTypeService.countByLifeId(lifeCycleDTO.getOid());
if(count !=null && count>0){
-
+ throw new VciBaseException("鐢熷懡鍛ㄦ湡琚娇鐢紝涓嶈兘琚垹闄�");
}
+ //鎴戜滑鏌ヨ鍏ㄩ儴node鍜宔dge锛岀劧鍚庝竴璧峰垹闄�
+
+ }
+
+
+ private List<LifeCycleNode> selectNodeByLifeOid(String lifeOid){
+ if(!StringUtils.hasLength(lifeOid)){
+ return new ArrayList<>();
+ }
+ LambdaQueryWrapper<LifeCycleNode> query = new LambdaQueryWrapper<LifeCycleNode>();
+ query.eq(LifeCycleNode::getLifeCycleOid,lifeOid);
+ return nodeMapper.selectList(query);
}
/**
--
Gitblit v1.9.3