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/viewmodel/admin/user/UserResponseVM.java | 64 ++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
index 6e8095d..c7e389e 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
+++ b/src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java
@@ -1,6 +1,9 @@
package com.mindskip.xzs.viewmodel.admin.user;
import com.mindskip.xzs.domain.User;
+import com.mindskip.xzs.domain.enums.DepartmentExamineEnum;
+import com.mindskip.xzs.domain.enums.UserConditionEnum;
+import com.mindskip.xzs.domain.enums.UserConditionExamineEnum;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.viewmodel.BaseVM;
@@ -47,15 +50,76 @@
private List<String> tagNames;
+ private UserConditionEnum condition;
+
+ private String conditionDetail;
+
+ private List<Integer> deptIdList;
+
+ private String password;
+
+ private DepartmentExamineEnum departmentExamineResult;
+
+ private UserConditionExamineEnum conditionExamineResult;
+
+ public DepartmentExamineEnum getDepartmentExamineResult() {
+ return departmentExamineResult;
+ }
+
+ public void setDepartmentExamineResult(DepartmentExamineEnum departmentExamineResult) {
+ this.departmentExamineResult = departmentExamineResult;
+ }
+
+ public UserConditionExamineEnum getConditionExamineResult() {
+ return conditionExamineResult;
+ }
+
+ public void setConditionExamineResult(UserConditionExamineEnum conditionExamineResult) {
+ this.conditionExamineResult = conditionExamineResult;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public List<Integer> getDeptIdList() {
+ return deptIdList;
+ }
+
+ public void setDeptIdList(List<Integer> deptIdList) {
+ this.deptIdList = deptIdList;
+ }
+
+ public String getConditionDetail() {
+ return conditionDetail;
+ }
+
+ public void setConditionDetail(String conditionDetail) {
+ this.conditionDetail = conditionDetail;
+ }
+
public static UserResponseVM from(User user) {
UserResponseVM vm = modelMapper.map(user, UserResponseVM.class);
vm.setBirthDay(DateTimeUtil.dateFormat(user.getBirthDay()));
vm.setLastActiveTime(DateTimeUtil.dateFormat(user.getLastActiveTime()));
vm.setCreateTime(DateTimeUtil.dateFormat(user.getCreateTime()));
vm.setModifyTime(DateTimeUtil.dateFormat(user.getModifyTime()));
+ vm.setPassword(null);
return vm;
}
+ public UserConditionEnum getCondition() {
+ return condition;
+ }
+
+ public void setCondition(UserConditionEnum condition) {
+ this.condition = condition;
+ }
+
public Integer getId() {
return id;
}
--
Gitblit v1.8.0