From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 14:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/service/ExcelService.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/ExcelService.java b/screen-api/src/main/java/com/moral/api/service/ExcelService.java
index 0b1e330..5cbdc40 100644
--- a/screen-api/src/main/java/com/moral/api/service/ExcelService.java
+++ b/screen-api/src/main/java/com/moral/api/service/ExcelService.java
@@ -4,6 +4,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
@@ -12,14 +13,28 @@
import com.moral.api.pojo.vo.excel.ExcelVo;
-public interface ExcelService {
+public interface ExcelService {
+ /**
+ * ���������������
+ * @param files
+ * @param params
+ * @return
+ * @throws IOException
+ */
public ExcelBO importTemplate(List<MultipartFile> files, Map<String, Object> params) throws IOException;
-
+ /**
+ * ���������������
+ * @param id
+ * @return
+ */
public ExcelVo export(Integer id);
-
+ //������
public List<ExcelBO> excelSelect(String startTime,String code,String endTime);
+
+
+
}
--
Gitblit v1.8.0