diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 448eeb26..4bf24aa9 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -85,27 +85,6 @@ public class SysUserController { return R.ok(sysUser); } - /** - * 个人信息更新 - * @param param - * @return - */ - @SysLog(title = "人员",desc = "个人信息更新",biz = BizType.UPDATE) - @PostMapping("/updateInfo") - public R updateInfo(@RequestBody @Valid SysUser param){ - LoginUser loginUser = AuthContextUtils.getLoginUser(); - SysUser sysUser = new SysUser(); - sysUser.setId(loginUser.getUserId()); - sysUser.setEmerAddress(param.getEmerAddress()); - sysUser.setEmerName(param.getEmerName()); - sysUser.setEmerMobile(param.getEmerMobile()); - sysUser.setEmerRelate(param.getEmerRelate()); - sysUser.setEmerWorksapce(param.getEmerWorksapce()); - sysUser.setUpdateTime(LocalDateTime.now()); - sysUserService.updateById(sysUser); - return R.ok(); - } - /** * 个人密码更新 * @param param @@ -125,8 +104,6 @@ public class SysUserController { return R.ok(); } return R.error(); - - } @@ -185,27 +162,6 @@ public class SysUserController { return R.byPageHelperList(list); } - /** - * 翻页查询(通讯录,添加隐藏标识过滤) - * @param param - * @return - */ - //@GetMapping("/page2") - @PreAuthorize("hasRole('sys:user:contact')") - public R> getPage2(SysUser param){ - param.setTenantId(AuthContextUtils.getTenant()); - if(CollectionUtil.isNotEmpty(param.getMultiDeptIds()) && param.getLoadChildDept()!=null && param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)){ - List deptList = sysDeptService.listDeptByIds(param.getMultiDeptIds(),param.getLoadChildDept().equals(GySysConst.STATUS_YES_1)); - List deptIds = deptList.stream().map(SysDept::getId).distinct().collect(Collectors.toList()); - param.setMultiDeptIds(deptIds); - } - PageUtil.startPage(); - List list = sysUserService.listUser(param); - //前端页面展示参数 - list.forEach(a->sysUserService.relateInfo(a)); - list.forEach(usr->usr.setPassword(null)); - return R.byPageHelperList(list); - } /** * 列表查询 @@ -335,40 +291,5 @@ public class SysUserController { return R.isTrue(result); } - - /** - * 人员职务调动 - * @param param - * @return - */ - @PostMapping("/tranPost") - @SysLog(title = "人员",desc = "职务调动") - @PreAuthorize("hasRole('sys:user:post')") - @LimitSubmit(interval = 5000) - public R tranPost(@RequestBody @Valid SysUserTranPostParam param){ - SysPost post = sysPostService.getById(param.getPostId()); - SysUser sysUser = sysUserService.getById(param.getUserId()); - sysUser.setDeptId(post.getDeptId()); - sysUser.setPositionId(post.getId()+""); - sysUserService.updateById(sysUser); - return R.ok(); - } - - /** - * 在职调动 - * @param param - * @return - */ - @SysLog(title = "人员",desc = "在职调动") - @PostMapping("/leave") - @PreAuthorize("hasRole('sys:user:leave')") - @LimitSubmit(interval = 5000) - public R leave(@RequestBody @Valid SysUserLeaveParam param){ - SysUser sysUser = sysUserService.getById(param.getUserId()); - sysUser.setServingState(param.getLeaveState()); - sysUserService.updateById(sysUser); - return R.ok(); - } - } diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java index 65d1aad8..16e17f66 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java @@ -79,101 +79,15 @@ public class SysUser implements Serializable { @Length(max = 45,message = "身份证号码长度不能超过45字") private String identityNo; - /** 入职日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate enterDate; - - /** 转正时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate formalDate; - - /** 正式员工【0->试用期;1->正式】 */ - private Integer formalStatus; - /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; - /** 紧急联系人名称 */ - @Length(max = 255,message = "紧急联系人名称长度不能超过255字") - private String emerName; - - /** 紧急联系人与本人关系 */ - @Length(max = 255,message = "紧急联系人与本人关系长度不能超过255字") - private String emerRelate; - - /** 紧急联系人电话 */ - @Length(max = 500,message = "紧急联系人电话长度不能超过500字") - private String emerMobile; - - /** 紧急联系人工作单位 */ - @Length(max = 255,message = "紧急联系人工作单位长度不能超过255字") - private String emerWorksapce; - - /** 紧急联系人住址 */ - @Length(max = 255,message = "紧急联系人住址长度不能超过255字") - private String emerAddress; - - /** 本地类型【0->本地;1->外地】 */ - private Integer localType; - - /** 户口性质【0->非农业;1->农业】 */ - private Integer houseType; - - /** 国籍 */ - @Length(max = 45,message = "国籍长度不能超过45字") - private String nation; - - /** 民族 */ -// @Length(max = 20,message = "民族长度不能超过20字") -// private String national; - - /** 籍贯 */ - @Length(max = 45,message = "籍贯长度不能超过45字") - private String nativePlace; - - /** 户籍所在地 */ - @Length(max = 100,message = "户籍所在地长度不能超过100字") - private String nativeAddress; - - /** 现居住详细地址 */ - @Length(max = 100,message = "现居住详细地址长度不能超过100字") - private String currAddress; - - /** 政治面貌 */ - @Length(max = 20,message = "政治面貌长度不能超过20字") - private String politicsStatus; - - /** 婚姻状态【0->未婚;1->已婚】 */ - private Integer marriedFlag; - - /** 性别【0->女;1->男】 */ - private Integer gender; - - /** 出生年月日 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate birthday; - - /** 毕业学校 */ - @Length(max = 255,message = "毕业学校长度不能超过255字") - private String eduSchool; - - /** 最高学历【0->未知;1->高中及以下;2->中专;3->大专;4->本科;5->硕士;6->博士】 */ - private Integer eduLevel; - - /** 毕业专业 */ - @Length(max = 255,message = "毕业专业长度不能超过255字") - private String eduProfession; /** 登陆客户端标识:android,ios */ - @Length(max = 20,message = "登陆客户端标识:android,ios长度不能超过20字") private String appClient; /** app推送token */ - @Length(max = 255,message = "友盟推送token长度不能超过255字") private String appToken; /** 创建时间 */ @@ -204,11 +118,6 @@ public class SysUser implements Serializable { @JsonIgnore private String tenantId; - - /** 查询参数 */ - @TableField(exist = false) - private String searchValue; - /** 查询参数:部门ID多选 */ @TableField(exist = false) private List multiDeptIds; @@ -237,22 +146,6 @@ public class SysUser implements Serializable { @TableField(exist = false) private List authorIds; - /** 选中ID */ - @TableField(exist = false) - private List selectIds; - - /** 拼音排序 */ - @TableField(exist = false) - private Integer orderByPinYin; - - /** 职务名称 */ - @TableField(exist = false) - private String positionVal; - - /** 职务名称 */ - @TableField(exist = false) - private String deptcode; - @TableField(exist = false) private List tenantInfo; @@ -292,17 +185,5 @@ public class SysUser implements Serializable { return sysUserVo; } - public SysUserTenant toSysUserTenant(String tenantId) { - SysUserTenant userTenant = new SysUserTenant(); - userTenant.setTenantId(tenantId); - userTenant.setId(this.getId()); - userTenant.setEnterDate(this.getEnterDate()); - userTenant.setFormalDate(this.getFormalDate()); - userTenant.setFormalStatus(this.getFormalStatus()); - userTenant.setServingState(this.getServingState()); - userTenant.setDeptId(this.getDeptId()); - return userTenant; - } - } diff --git a/src/main/java/com/qs/serve/modules/sys/entity/SysUserTenant.java b/src/main/java/com/qs/serve/modules/sys/entity/SysUserTenant.java deleted file mode 100644 index a81b6f7a..00000000 --- a/src/main/java/com/qs/serve/modules/sys/entity/SysUserTenant.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.qs.serve.modules.sys.entity; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * 用户校区信息 实体类 - * @author YenHex - * @since 2022-05-23 - */ -@Data -@TableName("sys_user_tenant") -public class SysUserTenant implements Serializable { - - private static final long serialVersionUID = 1L; - - /** 用户id */ - @TableId(type = IdType.ASSIGN_UUID) - private String id; - - /** IC卡号 */ - private String icCard; - - /** 入职日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate enterDate; - - /** 合同时间开始时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate servingPactDate; - - /** 合同时间结束时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate servingPactDateEnd; - - /** 转正时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private LocalDate formalDate; - - /** 正式员工【0->试用期;1->正式】 */ - private Integer formalStatus; - - /** 在职状态【0->离职;1->在职】 */ - private Integer servingState; - - /** 校区id */ - @JsonIgnore - @JsonProperty - private String tenantId; - - /** 创建时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createTime; - - /** 创建人 */ - @TableField(fill = FieldFill.INSERT) - private String createBy; - - /** 更新时间 */ - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @TableField(fill = FieldFill.UPDATE) - private LocalDateTime updateTime; - - /** 更新人 */ - @TableField(fill = FieldFill.UPDATE) - private String updateBy; - - /** 删除标识 */ - @JsonIgnore - @JsonProperty - private Boolean delFlag; - - @TableField(exist = false) - private String tenant; - - /** 部门ID */ - private String deptId; - - /** 人事管理类型 */ - private Integer hrType; - - /** 岗位 */ - private Long positionId; - - /** 职工类型【0->管理员;1->教师;2->职工】 */ - private Integer positionType; -} - diff --git a/src/main/resources/mapper/sys/SysUserMapper.xml b/src/main/resources/mapper/sys/SysUserMapper.xml index 76ffb0bf..f280d428 100644 --- a/src/main/resources/mapper/sys/SysUserMapper.xml +++ b/src/main/resources/mapper/sys/SysUserMapper.xml @@ -16,29 +16,7 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -63,29 +41,7 @@ sys_user.login_enable, sys_user.serving_state, sys_user.identity_no, - sys_user.enter_date, - sys_user.formal_date, - sys_user.formal_status, sys_user.remark, - sys_user.emer_name, - sys_user.emer_relate, - sys_user.emer_mobile, - sys_user.emer_worksapce, - sys_user.emer_address, - sys_user.local_type, - sys_user.house_type, - sys_user.nation, - - sys_user.native_place, - sys_user.native_address, - sys_user.curr_address, - sys_user.politics_status, - sys_user.married_flag, - sys_user.gender, - sys_user.birthday, - sys_user.edu_school, - sys_user.edu_level, - sys_user.edu_profession, sys_user.app_client, sys_user.app_token, sys_user.create_time, @@ -118,26 +74,6 @@ and sys_user.formal_date = #{query.formalDate} and sys_user.formal_status = #{query.formalStatus} and sys_user.remark = #{query.remark} - and sys_user.emer_name = #{query.emerName} - and sys_user.emer_relate = #{query.emerRelate} - and sys_user.emer_worksapce = #{query.emerWorksapce} - and sys_user.emer_address = #{query.emerAddress} - and sys_user.local_type = #{query.localType} - and sys_user.house_type = #{query.houseType} - and sys_user.nation = #{query.nation} - - and sys_user.native_place = #{query.nativePlace} - and sys_user.native_address = #{query.nativeAddress} - and sys_user.curr_address = #{query.currAddress} - and sys_user.politics_status = #{query.politicsStatus} - and sys_user.married_flag = #{query.marriedFlag} - and sys_user.gender = #{query.gender} - and sys_user.birthday = #{query.birthday} - and sys_user.edu_school = #{query.eduSchool} - and sys_user.edu_level = #{query.eduLevel} - and sys_user.edu_profession = #{query.eduProfession} - and sys_user.app_client = #{query.appClient} - and sys_user.app_token = #{query.appToken} and sys_user.create_time = #{query.createTime} and sys_user.create_by = #{query.createBy} and sys_user.update_time = #{query.updateTime}