Browse Source

日期格式化

6 năm trước cách đây
mục cha
commit
67c057cba9

+ 3 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/entity/Factory.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -52,6 +54,7 @@ public class Factory extends Model<Factory> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

+ 5 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/entity/Project.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -43,12 +45,14 @@ public class Project extends Model<Project> {
      * 开始时间
      */
     @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**
@@ -103,6 +107,7 @@ public class Project extends Model<Project> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

+ 3 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/entity/ProjectFile.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -73,6 +75,7 @@ public class ProjectFile extends Model<ProjectFile> {
      * 上传时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

+ 3 - 0
cloud-model/src/main/java/com/hssx/cloudmodel/entity/User.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -97,6 +99,7 @@ public class User extends Model<User> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

+ 3 - 3
cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -39,7 +39,6 @@
         <result column="company_name" property="companyName"/>
         <result column="parent_id" property="parentId" />
         <result column="sex" property="sex" />
-        <result column="role_name" property="roleName" />
         <result column="work_state" property="workState" />
         <result column="is_disable" property="isDisable" />
         <result column="indate" property="indate" />
@@ -51,8 +50,8 @@
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         SELECT
         u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,
-        r.role_name role_name,u.parent_id parent_id, u.sex sex,u.work_state work_state, u.is_disable is_disable,
-        u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.role_name role_name,u.subordinate_type subordinate_type
+        r.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
+        u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
         FROM
         tb_user AS u
         LEFT JOIN tb_company c
@@ -79,4 +78,5 @@
         </where>
         Order by u.id desc
     </select>
+
 </mapper>