From c50e176c4a6b9331d2d1c0520bafb18f54f0dee6 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 08 三月 2024 17:35:10 +0800 Subject: [PATCH] 部门增加管理员 --- src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java | 58 +++++++++------------------------------------------------- 1 files changed, 9 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java index f955916..0469737 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java @@ -111,7 +111,7 @@ PageInfo<User> info = PageHelper.startPage(grade.getPageIndex(), grade.getPageSize(), "id desc").doSelectPageInfo(() -> userService.getUsers()); for (User user : info.getList()) { - if(user.getRealName().equals("绠$悊鍛�")){ + if("绠$悊鍛�".equals(user.getRealName())){ continue; } ExamPaperAnswer answer = new ExamPaperAnswer(); @@ -123,48 +123,9 @@ answer.setCounts(byCreatUser.size()); filteredList9.add(answer); } -// PageInfo<ExamPaperAnswer> list = examPaperAnswerService.adminPageByGrade(grade); -// for (ExamPaperAnswer e : list.getList()) { -// User user = userService.selectByIdName(e.getCreateUser(), grade.getUserName()); -// if (user==null){ -// return null; -// } -// ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(e.getId()); -// Integer[] ids = examPaperSubjectService.getByExamPaperId(examPaperAnswer.getExamPaperId()).stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new); -// String names = ""; -// if (ids.length > 0) { -// names = subjectService.selectByIds(ids) -// .stream().map(Subject::getName).collect(Collectors.joining(",")); -// } -// Integer userId = examPaperUserService.getByPaperIdAndCreatUser(e.getExamPaperId(), e.getCreateUser()); -// if(userId == null){ -// return null; -// } -// e.setUserName(user.getRealName()); -// } -// List<ExamPaperAnswer> collect = list.getList().stream() -// .filter(exam -> exam != null) -// .collect(Collectors.toList()); -// ArrayList<ExamPaperAnswer> list2 = new ArrayList<>(); -// Map<String, Long> collect1 = collect.stream().collect(Collectors.groupingBy(ExamPaperAnswer::getPaperName, Collectors.counting())); -// collect.forEach(t->t.setCounts(Math.toIntExact(collect1.getOrDefault(t.getPaperName(),0L)))); -// Map<String, List<ExamPaperAnswer>> collect2 = collect.stream().collect(Collectors.groupingBy(ExamPaperAnswer::getUserName)); -// List<ExamPaperAnswer> filteredList1 = new ArrayList<>(); -// Set<String> uniqueUserNames = new HashSet<>(); -// collect2.forEach((key, value) -> { -// value.forEach(item -> { -// item.setUserName(key); -// item.setCounts(value.size()); -// }); -// list2.addAll(value); -// }); -// for (ExamPaperAnswer item : list2) { -// if (uniqueUserNames.add(item.getUserName())) { -// filteredList1.add(item); -// } -// } PageHelper.startPage(grade.getPageIndex(), grade.getPageSize()); PageInfo<ExamPaperAnswer> pageInfoPageInfo = new PageInfo<>(filteredList9); + pageInfoPageInfo.setTotal(info.getTotal()); return RestResponse.ok(pageInfoPageInfo); } @@ -173,20 +134,19 @@ return RestResponse.ok(examPaperAnswerService.getByCreatUser(scoreTemplatesCountVO)); } - @RequestMapping(value = "/updates", method = RequestMethod.POST) - public void updateDepartment(){ + + @RequestMapping(value = "/updates", method = RequestMethod.GET) + public void updateDepartment() { List<User> users = userService.getUsers(); for (User user : users) { Integer id = user.getId(); Integer userLevel = user.getUserLevel(); - UserDepartment userDepartment = userDepartMentService.selectByUser(id); - if (userDepartment!=null){ - userDepartment.setDepartmentId(userLevel); - userDepartMentService.updateUserDepartMent(userDepartment); - } + UserDepartment userDepartment = new UserDepartment(); + userDepartment.setUserId(id); + userDepartment.setDepartmentId(userLevel); + userDepartMentService.insert(userDepartment); } } - } -- Gitblit v1.8.0