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/controller/admin/UserController.java | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index cb8aad7..a645248 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -1,35 +1,27 @@
package com.mindskip.xzs.controller.admin;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
-import com.mindskip.xzs.domain.Department;
-import com.mindskip.xzs.domain.UserDepartment;
-import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.domain.UserEventLog;
+import com.mindskip.xzs.domain.*;
import com.mindskip.xzs.domain.enums.UserStatusEnum;
+import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.UserDepartmentMapper;
-import com.mindskip.xzs.service.AuthenticationService;
-import com.mindskip.xzs.service.DepartmentService;
-import com.mindskip.xzs.service.UserEventLogService;
-import com.mindskip.xzs.service.UserService;
+import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
+import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.utility.convert.UserClassConvert;
import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.user.*;
-import com.mindskip.xzs.utility.PageInfoHelper;
-import com.github.pagehelper.PageInfo;
-
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
@@ -42,33 +34,35 @@
private final AuthenticationService authenticationService;
private final DepartmentService departmentService;
private final UserDepartmentMapper userDepartmentMapper;
+ private final TagService tagService;
@Autowired
- public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper) {
+ public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper, TagService tagService) {
this.userService = userService;
this.userEventLogService = userEventLogService;
this.authenticationService = authenticationService;
this.departmentService = departmentService;
this.userDepartmentMapper = userDepartmentMapper;
+ this.tagService = tagService;
}
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
- PageInfo<User> pageInfo = userService.userPage(model);
- PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
- UserResponseVM.from(d));
+ model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
+ PageInfo<UserResponseVM> page = userService.userPage(model);
page.setList(page.getList().stream().map(e->{
List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
- String deptIds = "";
+ List<Department> list = new ArrayList<>();
for (UserDepartment userDepartment : userDepartments) {
Department byId = departmentService.getById(userDepartment.getDepartmentId());
- if(byId != null){
- deptIds = deptIds + byId.getName();
- break;
+ if (ObjectUtils.isNotEmpty(byId)) {
+ list.add(byId);
}
}
- e.setDeptNames(deptIds);
+ e.setDeptNames(StringUtils.join(list.stream().map(Department::getName).collect(Collectors.toList()), ","));
+ e.setDeptIdList(list.stream().map(Department::getId).collect(Collectors.toList()));
+ e.setTagNames(tagService.selectTagNamesByUserId(e.getId()));
return e;
}).collect(Collectors.toList()));
return RestResponse.ok(page);
@@ -88,7 +82,7 @@
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(id);
UserResponseVM userVm = UserResponseVM.from(user);
List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
String deptIds = "";
@@ -96,6 +90,8 @@
deptIds = deptIds + userDepartment.getDepartmentId().toString() + ",";
}
userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
+ userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
+ userVm.setPassword(authenticationService.pwdDecode(user.getPassword()));
return RestResponse.ok(userVm);
}
@@ -140,14 +136,30 @@
user.setModifyTime(new Date());
userService.updateByIdFilter(user);
}
+ Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
- for (String s : model.getDeptIds().split(",")) {
- UserDepartment userDepartment = new UserDepartment();
- userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(Integer.parseInt(s));
- userDepartmentMapper.insert(userDepartment);
+ if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
+ for (Integer s : model.getDeptIds()) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
+ userDepartmentMapper.insert(userDepartment);
+ }
}
- user.setDeptIds(model.getDeptIds());
+ tagService.removeUserTagByUserId(user.getId());
+ if (ObjectUtils.isNotEmpty(model.getTagIds())) {
+ tagService.saveBatchUserTag(model.getTagIds().stream().map(
+ tagId -> new UserTag() {{
+ setUserId(user.getId());
+ setTagId(tagId);
+ }}
+ ).collect(Collectors.toList()));
+ }
return RestResponse.ok(user);
}
@@ -164,7 +176,7 @@
@RequestMapping(value = "/changeStatus/{id}", method = RequestMethod.POST)
public RestResponse<Integer> changeStatus(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.selectById(id);
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode();
user.setStatus(newStatus);
@@ -176,7 +188,7 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public RestResponse delete(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(id);
user.setDeleted(true);
userService.updateByIdFilter(user);
return RestResponse.ok();
@@ -221,4 +233,14 @@
return RestResponse.ok();
}
+ @GetMapping("/getFailExamUser/{examPaperId}")
+ public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
+ return RestResponse.ok(userService.getFailExamUser(examPaperId));
+ }
+
+ @GetMapping("/getFailTemplateUser/{templateId}")
+ public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
+ return RestResponse.ok(userService.getFailTemplateUser(templateId));
+ }
+
}
--
Gitblit v1.8.0