From d117d3af15dddc4f07baffa8b5bf6b727c05de7c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 15:48:14 +0800
Subject: [PATCH] fix：补充提交
---
screen-api/src/main/java/com/moral/api/controller/ExcelController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
index 3aa71db..177a003 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ExcelController.java
@@ -19,6 +19,7 @@
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.vo.excel.ExcelVo;
+import com.moral.api.pojo.vo.excel.HnExcelVo;
import com.moral.api.pojo.vo.excel.SyExcelVo;
import com.moral.api.service.ExcelService;
import com.moral.api.service.HnExcelService;
@@ -129,4 +130,40 @@
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),syExcelVo);
}
+
+ /**
+ * ���������������������������
+ * @param id
+ * @return
+ */
+ @GetMapping("/hnExcelExport")
+ public ResultMessage hnExcelExport(Integer id) throws ParseException {
+ if (id==null){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+
+ HnExcelVo hnExcelVo = hnExcelService.hnExport(id);
+ if (hnExcelVo==null){
+ return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
+ }
+ return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),hnExcelVo);
+ }
+
+
+ /**
+ * ���������������
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ @PostMapping("rexcelImport")
+ public ResultMessage rexcelImport(HttpServletRequest request) throws IOException {
+
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+
+ excelService.rexcelImport(files);
+ return ResultMessage.ok(1);
+ }
+
+
}
--
Gitblit v1.8.0