chenxudong
/
electromagnetic-data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户页面bug修复

This commit is contained in:
s2042968 2024-12-05 15:10:43 +08:00
parent 520d1885f7
commit 7e30c40b1a
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java
View File

@ -1,6 +1,6 @@
package com.electromagnetic.industry.software.data.manage.request.user; package com.electromagnetic.industry.software.data.manage.request.user;
import cn.hutool.core.date.DateTime; import com.fasterxml.jackson.annotation.JsonFormat;
import electromagnetic.data.framework.share.model.BaseRequest; import electromagnetic.data.framework.share.model.BaseRequest;
import lombok.Data; import lombok.Data;
@ -46,7 +46,8 @@ public class UserModiRequest extends BaseRequest implements Serializable {
/** /**
* 入职日期 * 入职日期
*/ */
private DateTime joinTime; @JsonFormat(pattern = "yyyy-MM-dd")
private Date joinTime;
/** /**
* 工作状态 * 工作状态
@ -56,5 +57,6 @@ public class UserModiRequest extends BaseRequest implements Serializable {
/** /**
* 实习截止日期 * 实习截止日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date internshipEndDate; private Date internshipEndDate;
} }

5
facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java
View File

@ -1,6 +1,7 @@
package com.electromagnetic.industry.software.data.manage.request.user; package com.electromagnetic.industry.software.data.manage.request.user;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import electromagnetic.data.framework.share.model.BaseRequest; import electromagnetic.data.framework.share.model.BaseRequest;
import lombok.Data; import lombok.Data;
@ -41,7 +42,8 @@ public class UserRequest extends BaseRequest implements Serializable {
/** /**
* 入职日期 * 入职日期
*/ */
private DateTime joinTime; @JsonFormat(pattern="yyyy-MM-dd")
private Date joinTime;
/** /**
* 工作状态 * 工作状态
@ -51,6 +53,7 @@ public class UserRequest extends BaseRequest implements Serializable {
/** /**
* 实习截止日期 * 实习截止日期
*/ */
@JsonFormat(pattern="yyyy-MM-dd")
private Date internshipEndDate; private Date internshipEndDate;
} }

3
facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java
View File

@ -1,5 +1,6 @@
package com.electromagnetic.industry.software.data.manage.response.user; package com.electromagnetic.industry.software.data.manage.response.user;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -52,6 +53,7 @@ public class SingleUserResponse {
/** /**
* 入职日期 * 入职日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date joinTime; private Date joinTime;
/** /**
@ -62,6 +64,7 @@ public class SingleUserResponse {
/** /**
* 实习截止日期 * 实习截止日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date internshipEndDate; private Date internshipEndDate;
/** /**

2
infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml
View File

@ -79,7 +79,7 @@
<if test="userTitle != null and userTitle != ''">user_title = #{userTitle},</if> <if test="userTitle != null and userTitle != ''">user_title = #{userTitle},</if>
<if test="joinTime != null">join_time = #{joinTime},</if> <if test="joinTime != null">join_time = #{joinTime},</if>
<if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if> <if test="userStatus != null and userStatus != ''">user_status = #{userStatus},</if>
<if test="internshipEndDate != null">internship_end_date = #{internshipEndDate},</if> internship_end_date = #{internshipEndDate},
<if test="modifier != null and modifier != ''">modifier = #{modifier},</if> <if test="modifier != null and modifier != ''">modifier = #{modifier},</if>
<if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if> <if test="modifierName != null and modifierName != ''">modifier_name = #{modifierName},</if>
gmt_modified=now() gmt_modified=now()