From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 21881ba..7d53a23 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -3,12 +3,15 @@
 import com.vci.corba.omd.etm.EnumType;
 import com.vci.dto.OsEnumDTO;
 import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.starter.web.pagemodel.PageHelper;
 import com.vci.pagemodel.KeyValue;
 import com.vci.pagemodel.OsEnumItemVO;
 import com.vci.pagemodel.OsEnumVO;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -69,11 +72,11 @@
 
 	/**
 	 * 鏌ョ湅鏋氫妇鐨勪娇鐢ㄨ寖鍥�
-	 * @param enumName
+	 * @param enumName 鏋氫妇鍚嶇О
 	 * @return
 	 * @throws PLException
 	 */
-	List<OsEnumVO> getUsedEnumList(String enumName) throws PLException;
+	List<Map<String,String>> getUsedEnumList(String enumName) throws PLException;
 
 	/**
 	 * 鏍规嵁鏋氫妇鑻辨枃鍚嶇О鑾峰彇鏋氫妇绫诲瀷
@@ -102,6 +105,29 @@
 	 * @return
 	 */
 	boolean deleteEnumTypes(List<OsEnumDTO> osEnumDTOS) throws PLException;
+
+	/**
+	 * 瀵煎嚭鏋氫妇绫诲瀷
+	 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
+	 * @param enumNames 闇�瑕佸鍑虹殑鏋氫妇鍚嶇О
+	 * @return
+	 */
+	String exportEnumTypes(String exportFileName,String enumNames) throws PLException;
+
+	/**
+	 * 瀵煎叆鏋氫妇
+	 * @param file
+	 * @return
+	 * @throws Exception
+	 */
+	BaseResult importEnumTypes(File file) throws Exception;
+
+	/**
+	 * 涓嬭浇瀵煎叆妯℃澘
+	 * @param exportFileName
+	 * @return
+	 */
+	String downloadEnumTemplate(String exportFileName);
 
 	/**
 	 * 鏌ヨ鎵�鏈夌殑鏋氫妇鏄犲皠
@@ -178,4 +204,12 @@
 	 * @return 鏋氫妇閫夐」
 	 */
 	DataGrid<OsEnumItemVO> gridEnumItemByOid(String pkEnum);
+
+	/**
+	 * 鏍规嵁鏋氫妇绫诲瀷鏌ヨ鏋氫妇锛氭灇涓惧悕 , 鏋氫妇
+	 * @param enumType锛歋tring, Integer
+	 * @return
+	 */
+	List<Map<String,List<String>>> getEnumMapByType(String enumType);
+
 }

--
Gitblit v1.9.3