From c0025985707e90ef01e4a178691c2609ba0459e5 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 07 七月 2023 10:01:51 +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 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 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 982c852..9fed8ea 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 @@ -3,8 +3,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.omd.dto.LifeCycleDTO; +import com.vci.ubcs.omd.entity.LifeCycleEvent; import com.vci.ubcs.omd.entity.LifeCycleRule; 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.starter.web.pagemodel.PageHelper; import org.springblade.core.mp.support.Query; @@ -27,6 +29,14 @@ * @return 鐢熷懡鍛ㄦ湡鐨勬樉绀哄璞� */ IPage<LifeCycleVO> listLife(Map<String, Object> conditionMap, Query query); + + /** + * 鑾峰彇鍏ㄩ儴鐨勪簨浠� + * @param conditionMap 鏌ヨ鏉′欢 + * @param query 鍒嗛〉 + * @return 浜嬩欢鐨勬樉绀哄璞� + */ + IPage<LifeCycleEventVO> listEvent(Map<String, Object> conditionMap, Query query); /** * 娣诲姞淇濆瓨 @@ -74,4 +84,6 @@ * @return 涓氬姟绫诲瀷 */ List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO); + + } -- Gitblit v1.9.3