From e914fb558e491e4cf09a9007fb1cc5c1a6358f43 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 06 七月 2023 11:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
index fd21582..982c852 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
@@ -7,7 +7,9 @@
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.omd.vo.LifeCycleVO;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import org.springblade.core.mp.support.Query;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -21,10 +23,10 @@
 	/**
 	 * 鑾峰彇鐢熷懡鍛ㄦ湡鍒楄〃
 	 * @param conditionMap 鏌ヨ鏉′欢
-	 * @param pageHelper 鍒嗛〉
+	 * @param query 鍒嗛〉
 	 * @return 鐢熷懡鍛ㄦ湡鐨勬樉绀哄璞�
 	 */
-	IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper);
+	IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query);
 
 	/**
 	 * 娣诲姞淇濆瓨
@@ -38,7 +40,21 @@
 	 * @param lifeCycleDTOs 鏁版嵁浼犺緭瀵硅薄
 	 * @return 娣诲姞鍚庣殑鏄剧ず瀵硅薄
 	 */
-	List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs);
+	List<LifeCycleVO> batchAddSave(Collection<LifeCycleDTO> lifeCycleDTOs);
+
+	/**
+	 * 淇敼淇濆瓨
+	 * @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
+	 * @return
+	 */
+	LifeCycleVO editSave(LifeCycleDTO lifeCycleDTO);
+
+	/**
+	 * 鎵归噺淇敼淇濆瓨
+	 * @param lifeCycleDTOs
+	 * @return
+	 */
+	List<LifeCycleVO> batchEditSave(Collection<LifeCycleDTO> lifeCycleDTOs);
 
 	/**
 	 * 鍒犻櫎鐢熷懡鍛ㄦ湡

--
Gitblit v1.9.3