From fe02c17b263405059837da6e3e5f7a353df58e99 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 七月 2024 15:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
index 5931650..2f45519 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
@@ -4,9 +4,12 @@
 import com.vci.corba.omd.atm.AttributeDef;
 import com.vci.dto.OsAttributeDTO;
 import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.starter.web.pagemodel.BaseResult;
 import com.vci.starter.web.pagemodel.DataGrid;
 import com.vci.pagemodel.OsAttributeVO;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -147,9 +150,25 @@
 	 * 瀵煎嚭閫変腑鐨勫睘鎬�
 	 * @param exportFileName 瀵煎嚭鐨勬枃浠跺悕
 	 * @param attrNames 闇�瑕佸鍑虹殑灞炴�у悕绉�
+	 * @param flag 鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�
 	 * @return
 	 */
-	String exportAttributes(String exportFileName,String attrNames) throws PLException;
+	String exportAttributes(String exportFileName,String attrNames,boolean flag/*鎺у埗瀵煎嚭鐨勫垪鍚嶆槸鍚﹀拰瀵煎叆妯℃澘涓�鑷�*/) throws PLException;
+
+	/**
+	 * 涓嬭浇灞炴�у鍏ユā鏉�
+	 * @param exportFileName
+	 * @return
+	 * @throws PLException
+	 */
+	String downloadAttributeTemplate(String exportFileName) throws Exception;
+
+	/**
+	 * 瀵煎叆灞炴��
+	 * @param file
+	 * @return
+	 */
+	BaseResult importAttributes(File file) throws Exception;
 
 	/**
 	 * 鏄惁榛樿鐨勫睘鎬�

--
Gitblit v1.9.3