From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 14 五月 2025 15:50:57 +0800 Subject: [PATCH] bug:学员有状态不能修改问题 --- src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java | 68 +++++++++++++++++++++++++++++----- 1 files changed, 58 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java index b7c4452..92d2ae9 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java @@ -1,15 +1,18 @@ package com.mindskip.xzs.service.impl; -import com.mindskip.xzs.domain.other.KeyValue; -import com.mindskip.xzs.domain.vo.UserVO; -import com.mindskip.xzs.exception.BusinessException; -import com.mindskip.xzs.domain.User; -import com.mindskip.xzs.event.OnRegistrationCompleteEvent; -import com.mindskip.xzs.repository.UserMapper; -import com.mindskip.xzs.service.UserService; -import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.mindskip.xzs.domain.Department; +import com.mindskip.xzs.domain.ExamPaper; +import com.mindskip.xzs.domain.User; +import com.mindskip.xzs.domain.other.KeyValue; +import com.mindskip.xzs.event.OnRegistrationCompleteEvent; +import com.mindskip.xzs.exception.BusinessException; +import com.mindskip.xzs.repository.UserMapper; +import com.mindskip.xzs.service.UserService; +import com.mindskip.xzs.utility.TreeUtils; +import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM; +import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; @@ -42,6 +45,11 @@ @Override public User getUserById(Integer id) { return userMapper.getUserById(id); + } + + @Override + public User getUserInfoById(Integer id) { + return userMapper.getUserInfoById(id); } @Override @@ -92,7 +100,7 @@ @Override - public PageInfo<User> userPage(UserPageRequestVM requestVM) { + public PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM) { return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> userMapper.userPage(requestVM) ); @@ -174,8 +182,48 @@ } @Override - public void setStatus(UserVO user) { + public void setStatus(User user) { userMapper.setStatus(user); } + @Override + public User getUserByExam(ExamPaper examPaper) { + return userMapper.getUserByExam(examPaper); + } + + @Override + public List<Integer> getDeptAdminIds(Integer userId) { + return userMapper.getDeptAdminIds(userId); + } + + @Override + public List<Department> getDeptAdminIdAndInfo(Integer userId) { + return userMapper.getDeptAdminIdAndInfo(userId); + } + + @Override + public List<Department> getDeptAdmins(List<Integer> ids) { + List<Department> list = userMapper.getDeptAdmins(ids); + return TreeUtils.build(list); + } + + @Override + public User getUserByExamByTemplateId(ExamPaper examPaper) { + return userMapper.getUserByExamByTemplateId(examPaper); + } + + @Override + public List<Integer> getDeptIds(Integer userId) { + return userMapper.getDeptIds(userId); + } + + @Override + public List<User> getFailExamUser(Integer examPaperId) { + return userMapper.getFailExamUser(examPaperId); + } + + @Override + public List<User> getFailTemplateUser(Integer templateId) { + return userMapper.getFailTemplateUser(templateId); + } } -- Gitblit v1.8.0