From 219cf838792ab0d50dd042d0fb8c60dd3a1e76f8 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 17:56:47 +0800
Subject: [PATCH] feat：部门管理员不展示通知
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 7049976..bda4cdf 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
@@ -271,12 +271,38 @@
if(userDepartments.size() != 0){
Department byId = departmentService.getById(userDepartments.get(0).getDepartmentId());
e.setDepartmentName(byId.getName());
+ e.setDeptId(byId.getId());
}
return e;
}).collect(Collectors.toList());
return paperExcel;
}
+ @Override
+ public List<PaperExcelVO> getRandomPaperExcelById(Integer id) {
+ List<PaperExcelVO> paperExcel = examPaperMapper.getRandomPaperExcelById(id);
+ // 濡傛灉鏌愯�冪敓瀛樺湪澶氫釜閮ㄩ棬锛屾瘡涓儴闂ㄩ兘鍔犱竴閬嶆暟鎹�
+ List<PaperExcelVO> needAdd = new ArrayList<>();
+ List<PaperExcelVO> needRemove = new ArrayList<>();
+ paperExcel = paperExcel.stream().map(e->{
+ e.setPaperScore(ExamUtil.scoreToVM(Integer.parseInt(e.getPaperScore())));
+ e.setUserScore(ExamUtil.scoreToVM(Integer.parseInt(e.getUserScore())));
+ List<Department> userDepartments = userDepartmentMapper.selectDeptByUserId(Integer.parseInt(e.getUserId()));
+ for (Department dept : userDepartments) {
+ PaperExcelVO vo = new PaperExcelVO();
+ BeanUtils.copyProperties(e, vo);
+ vo.setDepartmentName(dept.getName());
+ vo.setDeptId(dept.getId());
+ needAdd.add(vo);
+ needRemove.add(e);
+ }
+ return e;
+ }).collect(Collectors.toList());
+ paperExcel.removeAll(needRemove);
+ paperExcel.addAll(needAdd);
+ return paperExcel;
+ }
+
private void examPaperFromVM(ExamPaperEditRequestVM examPaperEditRequestVM, ExamPaper examPaper, List<ExamPaperTitleItemVM> titleItemsVM) {
// Integer gradeLevel = subjectService.levelBySubjectId(examPaperEditRequestVM.getSubjectId());
Integer questionCount = titleItemsVM.stream()
--
Gitblit v1.8.0