From 160e150009b51a39fa95d9462c3798ba28d51a09 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 15 八月 2023 08:49:47 +0800
Subject: [PATCH] 审批页面修改
---
src/main/java/com/whyc/controller/UserLogController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserLogController.java b/src/main/java/com/whyc/controller/UserLogController.java
index b3c5284..e4001dc 100644
--- a/src/main/java/com/whyc/controller/UserLogController.java
+++ b/src/main/java/com/whyc/controller/UserLogController.java
@@ -4,17 +4,24 @@
import com.whyc.dto.Response;
import com.whyc.pojo.UserLog;
import com.whyc.service.UserLogService;
+import com.whyc.util.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Objects;
/**
* 鐢ㄦ埛鎿嶄綔鏃ュ織
*/
@RestController
@RequestMapping("userLog")
-@Api(tags = "鐢ㄦ埛鎿嶄綔浜嬩欢")
+@Api(tags = "鐢ㄦ埛绠＄悊-鎿嶄綔浜嬩欢绠＄悊")
public class UserLogController {
@Autowired
@@ -22,9 +29,23 @@
@ApiOperation(value = "鍒嗛〉")
@PostMapping("page")
- public Response<PageInfo<UserLog>> getPage(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody UserLog userLog){
- PageInfo<UserLog> pageInfo = service.getPage(pageNum,pageSize,userLog);
- return new Response<PageInfo<UserLog>>().set(1,pageInfo);
+ public Response<PageInfo<Object>> getPage(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody UserLog userLog) throws ParseException {
+ //PageInfo<UserLog> pageInfo = service.getPage(pageNum,pageSize,userLog);
+ PageInfo<Object> pageInfo = service.getPage2(pageNum,pageSize,userLog);
+ return new Response<PageInfo<Object>>().set(1,pageInfo);
+ }
+
+ @PostMapping("exportExcel")
+ @ApiOperation(value = "瀵煎嚭excel",produces = "application/octet-stream")
+ public void exportExcel(HttpServletResponse response,@RequestBody List<List<String>> valueList){
+
+ String[][] value = new String[valueList.size()][valueList.get(0).size()];
+ for (int i = 0; i < valueList.size(); i++) {
+ for (int j = 0; j < valueList.get(i).size(); j++) {
+ value[i][j]=valueList.get(i).get(j);
+ }
+ }
+ service.exportExcel(response,value);
}
}
--
Gitblit v1.9.1