From 3c3c7cb06d7091d06109ad6076e9dcfd965356d9 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 05 六月 2024 15:40:08 +0800
Subject: [PATCH] 打包问题，正式数据备份
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesUserCountController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesUserCountController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesUserCountController.java
index 5eed6df..ae8c8a3 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesUserCountController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesUserCountController.java
@@ -27,6 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController("AdminExamTemplatesUserCountController")
@@ -62,8 +63,14 @@
}
PageInfo<ExamTemplatesUserCountVO> info = examTemplatesUserCountService.list(model);
info.setList(info.getList().stream().map(e -> {
- e.setName(examTemplatesMapper.getById(e.getId()).getName());
- e.setUserName(userService.getUserById(e.getUserId()).getRealName());
+ ExamTemplates byId = examTemplatesMapper.getById(e.getId());
+ if (Objects.nonNull(byId)) {
+ e.setName(byId.getName());
+ }
+ User userById = userService.getUserById(e.getUserId());
+ if (Objects.nonNull(userById)) {
+ e.setUserName(userById.getRealName());
+ }
return e;
}).collect(Collectors.toList()));
return RestResponse.ok(info);
@@ -122,14 +129,20 @@
@RequestMapping(value = "/exportRandownTemplatesId/{id}", method = RequestMethod.GET)
@SneakyThrows
public void exportRandownTemplatesId(@PathVariable("id") Integer id, HttpServletResponse response, HttpServletRequest request) {
+ // 鏌ュ嚭璇曞嵎妯℃澘
ExamTemplates byId = examTemplatesMapper.getById(id);
+ // 鏌ュ嚭璇ユā鏉跨殑鍙傝�冧汉鏁版嵁
List<ExamTemplatesUser> byId1 = examTemplatesUserMapper.getById(id);
-
+ // 鏌ュ嚭杩欏紶璇曞嵎鐨勫弬鑰冭褰�
List<ExamTemplatesUserCount> byTemplates = examTemplatesUserCountService.getByTemplates(id);
+ // 鑾峰彇姣忎釜浜虹殑璇曞嵎ID
List<Integer> list = byTemplates.stream().map(ExamTemplatesUserCount::getExamPaperId).collect(Collectors.toList());
+ // 鑾峰彇鍙傝�冪敤鎴稩D
List<Integer> userIds = byId1.stream().map(e->Integer.parseInt(e.getUserId())).collect(Collectors.toList());
- //鑰冭瘯
+ // 绛斿嵎
List<ExamPaperAnswer> result = new ArrayList<>();
+
+ // 鑾峰彇鑰冭瘯绛斿嵎
if(list.size()!=0){
result = examPaperAnswerMapper.getResult(list);
}
@@ -160,8 +173,6 @@
str = false;
}
-
-
ExcelUtils.export(response,"涓汉缁冧範",list1, TeamplatesUserExcelVO.class);
}
--
Gitblit v1.8.0