From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 04 十二月 2024 10:47:05 +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 | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 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 615269e..9bb8d74 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 @@ -1,14 +1,15 @@ package com.vci.web.service; + import com.vci.corba.common.PLException; import com.vci.corba.omd.etm.EnumType; import com.vci.dto.OsEnumDTO; +import com.vci.pagemodel.KeyValue; +import com.vci.pagemodel.OsEnumItemVO; +import com.vci.pagemodel.OsEnumVO; 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.Collection; @@ -109,9 +110,10 @@ * 瀵煎嚭鏋氫妇绫诲瀷 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕 * @param enumNames 闇�瑕佸鍑虹殑鏋氫妇鍚嶇О + * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷� * @return */ - String exportEnumTypes(String exportFileName,String enumNames) throws PLException; + String exportEnumTypes(String exportFileName,String enumNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException; /** * 瀵煎叆鏋氫妇 @@ -203,4 +205,12 @@ * @return 鏋氫妇閫夐」 */ DataGrid<OsEnumItemVO> gridEnumItemByOid(String pkEnum); + + /** + * 鏍规嵁鏋氫妇绫诲瀷鏌ヨ鏋氫妇锛氭灇涓惧悕 , 鏋氫妇 + * @param enumType锛歋tring, Integer + * @return + */ + List<Map<String,List<String>>> getEnumMapByType(String enumType); + } -- Gitblit v1.9.3