Browse Source

用户管理新建添加入职时间字段

main
1341924763@qq.com 2 days ago
parent
commit
a5a43306a7

+ 5
- 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java View File

package com.ruoyi.common.core.domain.entity; package com.ruoyi.common.core.domain.entity;


import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.common.annotation.Sensitive; import com.ruoyi.common.annotation.Sensitive;
return UserConstants.ADMIN_ID.equals(this.userId); return UserConstants.ADMIN_ID.equals(this.userId);
} }


// 入职时间
@JsonFormat(pattern = "yyyy-MM-dd")
private Date joinedDate;

} }

+ 4
- 0
zs-manager/src/main/java/com/ruoyi/zhushi/job/DkJob.java View File

// 获取员工姓名 // 获取员工姓名
String userName = jsonObject.getString("userName"); String userName = jsonObject.getString("userName");


// 获取员工昵称
String nickName = jsonObject.getString("nickName");

// 根据userId 查询考勤组信息 // 根据userId 查询考勤组信息
DkAttendanceGroup appDTO = dkRecordMapper.queryConfigByUserId(userId); DkAttendanceGroup appDTO = dkRecordMapper.queryConfigByUserId(userId);
// 如果没有考勤组信息,则跳过 // 如果没有考勤组信息,则跳过
DkCheckInRecord dkCheckInRecord = new DkCheckInRecord(); DkCheckInRecord dkCheckInRecord = new DkCheckInRecord();
dkCheckInRecord.setSysUserId(userId); dkCheckInRecord.setSysUserId(userId);
dkCheckInRecord.setSysUserName(userName); dkCheckInRecord.setSysUserName(userName);
dkCheckInRecord.setNickName(nickName);
dkCheckInRecord.setCheckInTime(LocalDateTime.now()); dkCheckInRecord.setCheckInTime(LocalDateTime.now());
dkCheckInRecord.setCheckInStatus(Constans.CHECK_IN_STATUS_0); dkCheckInRecord.setCheckInStatus(Constans.CHECK_IN_STATUS_0);
dkCheckInRecord.setClockInStatus(Constans.CHECK_IN_STATUS_0); dkCheckInRecord.setClockInStatus(Constans.CHECK_IN_STATUS_0);

+ 1
- 1
zs-manager/src/main/resources/mapper/DkRecordMapper.xml View File

</select> </select>


<select id="queryAllUsers" resultType="com.alibaba.fastjson.JSONObject"> <select id="queryAllUsers" resultType="com.alibaba.fastjson.JSONObject">
SELECT user_id userId, user_name userName FROM `sys_user`
SELECT user_id userId, user_name userName, , nick_name nickName FROM `sys_user`
</select> </select>


<select id="getRecordHistory" resultType="com.ruoyi.zhushi.entity.DkCheckInRecord"> <select id="getRecordHistory" resultType="com.ruoyi.zhushi.entity.DkCheckInRecord">

Loading…
Cancel
Save