From fd9756db8280007572de40fc5fe8890d12863cbd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 02 七月 2024 10:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
index 9290c23..eeb80ba 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/SmUserQueryServiceI.java
@@ -1,16 +1,14 @@
package com.vci.frameworkcore.compatibility;
import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
+import com.vci.frameworkcore.model.dto.SmUserDTO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.web.model.SmUserDO;
+import com.vci.starter.web.pagemodel.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -282,6 +280,21 @@
* @param flag
* @return
*/
- boolean disableOrEnableUsers(String[] ids,boolean flag) throws PLException;
+ boolean stopUsers(String[] ids,boolean flag) throws PLException;
+
+ /**
+ * 涓嬭浇瀵煎叆浜哄憳鐨別xcel妯℃澘銆�
+ * @param downloadFileName
+ * @return
+ */
+ String downloadImportTemplate(String downloadFileName);
+
+ /**
+ * 瀵煎叆鎴愬憳
+ * @param file
+ * @return
+ * @throws VciBaseException
+ */
+ BaseResult importUser(File file) throws VciBaseException;
}
--
Gitblit v1.9.3