Parcourir la source

货位变更时间

ZeroLiYi il y a 1 an
Parent
commit
2560aecdc8

+ 3 - 2
src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardWarehouseRecordMapper.xml

@@ -19,7 +19,7 @@
19 19
     <insert id="insert">
20 20
         insert into grain_situation_card_warehouse_record (id, createdate, updatename, updatedate,
21 21
                                                            grain_situation_card_id, new_warehouse_number,
22
-                                                           old_warehouse_number, change_reason)
22
+                                                           old_warehouse_number, change_reason,change_time)
23 23
         values (#{id,jdbcType=INTEGER},
24 24
                 #{createdate,jdbcType=TIMESTAMP},
25 25
                 #{updatename,jdbcType=DECIMAL},
@@ -27,12 +27,13 @@
27 27
                 #{grainSituationCardId,jdbcType=INTEGER},
28 28
                 #{newWarehouseNumber,jdbcType=VARCHAR},
29 29
                 #{oldWarehouseNumber,jdbcType=VARCHAR},
30
-                #{changeReason,jdbcType=VARCHAR})
30
+                #{changeReason,jdbcType=VARCHAR},#{changeTime,jdbcType=TIMESTAMP})
31 31
 
32 32
 
33 33
     </insert>
34 34
     <select id="findByCardId" resultType="com.chinaitop.depot.storage.model.GrainSituationCardWarehouseRecord" resultMap="BaseResultMap">
35 35
         select
36
+               id,
36 37
             change_time,
37 38
             new_warehouse_number,
38 39
             old_warehouse_number,

+ 4 - 0
src/main/java/com/chinaitop/depot/storage/model/GrainSituationCardWarehouseRecord.java

@@ -12,6 +12,7 @@
12 12
  */
13 13
 package com.chinaitop.depot.storage.model;
14 14
 
15
+import com.fasterxml.jackson.annotation.JsonFormat;
15 16
 import io.swagger.annotations.ApiModelProperty;
16 17
 import lombok.Getter;
17 18
 import lombok.Setter;
@@ -33,6 +34,7 @@ public class GrainSituationCardWarehouseRecord {
33 34
     private Integer id;
34 35
 
35 36
     /** 创建日期 */
37
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
36 38
     @ApiModelProperty(value = "创建日期", position = 2)
37 39
     private Date createdate;
38 40
 
@@ -41,6 +43,7 @@ public class GrainSituationCardWarehouseRecord {
41 43
     private String updatename;
42 44
 
43 45
     /** 更新日期 */
46
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
44 47
     @ApiModelProperty(value = "更新日期", position = 4)
45 48
     private Date updatedate;
46 49
 
@@ -49,6 +52,7 @@ public class GrainSituationCardWarehouseRecord {
49 52
     private Integer grainSituationCardId;
50 53
 
51 54
     /** 变更时间 */
55
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
52 56
     @ApiModelProperty(value = "变更时间", position = 6)
53 57
     private Date changeTime;
54 58