From 13a68df58b3f937db5ba6437c814bafdcd8d37f8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 27 五月 2024 16:09:41 +0800
Subject: [PATCH] 登录时如果不是部门管理员则deptIds填充为用户所在部门
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
index f0d9dc0..88c8287 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
@@ -9,7 +9,9 @@
import com.mindskip.xzs.domain.exam.ExamPaperQuestionItemObject;
import com.mindskip.xzs.domain.exam.ExamPaperTitleItemObject;
import com.mindskip.xzs.domain.other.KeyValue;
+import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
import com.mindskip.xzs.repository.ExamPaperMapper;
import com.mindskip.xzs.repository.QuestionMapper;
@@ -205,15 +207,18 @@
vm.setDepartmentIds(examPaperDepartmentService.getByExamPaperId(examPaper.getId())
.stream().map(ExamPaperDepartment::getDepartmentId).toArray(Integer[]::new));
List<ExamPaperUser> examPaperUsers = examPaperUserService.getByExamPaperId(examPaper.getId());
- Integer[][] userIds = new Integer[examPaperUsers.size()][2];
+ List<Integer> userIds = new ArrayList();
+ List<String> userNames = new ArrayList();
for (int i = 0; i < examPaperUsers.size(); i++) {
User user = userService.getUserById(examPaperUsers.get(i).getUserId());
if (ObjectUtils.isNotEmpty(user)) {
- Integer[] userId = {user.getUserLevel(), examPaperUsers.get(i).getUserId()};
- userIds[i] = userId;
+ Integer userId = examPaperUsers.get(i).getUserId();
+ userIds.add(userId);
+ userNames.add(user.getRealName());
}
}
- vm.setUserId(userIds);
+ vm.setUserIds(userIds);
+ vm.setUserNames(userNames);
return vm;
}
@@ -625,7 +630,34 @@
}
@Override
+ @Transactional
+ public void missExamByTemplateId(ExamTemplatesVO model) {
+ List<Integer> id = examPaperMapper.getExamPaperByTemplateId(model);
+ model.setPaperIds(id);
+ // 鏍规嵁鑰冭瘯id灏嗛�夋嫨鐨勮ˉ鑰冭�冪敓鐨勮�冭瘯鎴愮哗璁剧疆涓烘棤鏁�
+ examPaperAnswerMapper.setMissExamByTemplate(model);
+ }
+
+ @Override
public List<ExamPaper> list(List<Integer> deptIds) {
- return examPaperMapper.list(deptIds);
+ List<ExamPaper> list = examPaperMapper.list(deptIds);
+ List<ExamPaper> template = examPaperMapper.template(deptIds);
+ list.addAll(template);
+ return list.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList());
+ }
+
+ @Override
+ public PageInfo<UserVO> selectStudent(UserVO userVO, List<Integer> adminDeptIds) {
+ userVO.setDeptIds(ObjectUtils.isNotEmpty(userVO.getDeptIds()) ? userVO.getDeptIds() : adminDeptIds);
+ return PageHelper.startPage(userVO.getPageIndex(), userVO.getPageSize()).doSelectPageInfo(() ->
+ examPaperMapper.selectStudent(userVO));
+ }
+
+ @Override
+ public List<ExamPaper> queryCondition() {
+ List<ExamPaper> examPaperList = examPaperMapper.getExamPaper();
+ List<ExamPaper> templateList = examPaperMapper.getTemplate();
+ examPaperList.addAll(templateList);
+ return examPaperList.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList());
}
}
--
Gitblit v1.8.0