diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java index 2a5276d..94523df 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserModiRequest.java @@ -1,6 +1,6 @@ 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 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; } diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java index b819623..8eee110 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/request/user/UserRequest.java @@ -1,6 +1,7 @@ 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 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; } diff --git a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java index 9dfabe8..d6a800e 100644 --- a/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java +++ b/facade/src/main/java/com/electromagnetic/industry/software/data/manage/response/user/SingleUserResponse.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.data.manage.response.user; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -52,6 +53,7 @@ public class SingleUserResponse { /** * 入职日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date joinTime; /** @@ -62,6 +64,7 @@ public class SingleUserResponse { /** * 实习截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date internshipEndDate; /** diff --git a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml index ee0c6c3..4adf475 100644 --- a/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml +++ b/infrastructure/repository/src/main/resources/sqlmapper/UserMapper.xml @@ -79,7 +79,7 @@ user_title = #{userTitle}, join_time = #{joinTime}, user_status = #{userStatus}, - internship_end_date = #{internshipEndDate}, + internship_end_date = #{internshipEndDate}, modifier = #{modifier}, modifier_name = #{modifierName}, gmt_modified=now()