From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期三, 03 七月 2024 18:29:31 +0800 Subject: [PATCH] feat:新增随机时间题目配置 --- src/main/java/com/mindskip/xzs/viewmodel/admin/user/UserResponseVM.java | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 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 f0a5ff7..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,8 +1,13 @@ 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; + +import java.util.List; public class UserResponseVM extends BaseVM { @@ -41,13 +46,78 @@ private String deptNames; + private List<Integer> tagIds; + + 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() { @@ -185,4 +255,20 @@ public void setDeptNames(String deptNames) { this.deptNames = deptNames; } + + public List<Integer> getTagIds() { + return tagIds; + } + + public void setTagIds(List<Integer> tagIds) { + this.tagIds = tagIds; + } + + public List<String> getTagNames() { + return tagNames; + } + + public void setTagNames(List<String> tagNames) { + this.tagNames = tagNames; + } } -- Gitblit v1.8.0