소스 검색

水分检验

hanqingsong 1 년 전
부모
커밋
5c412e39a8

+ 35 - 5
src/main/java/com/chinaitop/depot/storage/mapper/StorageWaterCheckMapper.xml

@@ -13,6 +13,8 @@
13
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
13
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
14
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
14
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
15
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
15
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
16
+    <result column="commit_people" property="commitPeople" jdbcType="VARCHAR" />
17
+    <result column="commit_time" property="commitTime" jdbcType="TIMESTAMP" />
16
   </resultMap>
18
   </resultMap>
17
   <sql id="Example_Where_Clause" >
19
   <sql id="Example_Where_Clause" >
18
     <where >
20
     <where >
@@ -73,7 +75,7 @@
73
     </where>
75
     </where>
74
   </sql>
76
   </sql>
75
   <sql id="Base_Column_List" >
77
   <sql id="Base_Column_List" >
76
-    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time, data_status
78
+    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time, data_status, commit_people, commit_time
77
   </sql>
79
   </sql>
78
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" >
80
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" >
79
     select
81
     select
@@ -109,11 +111,11 @@
109
     insert into storage_water_check (id, org_id, house_id, 
111
     insert into storage_water_check (id, org_id, house_id, 
110
       ware_id, lspz, hy_date, 
112
       ware_id, lspz, hy_date, 
111
       hy_person, remark, input_time, 
113
       hy_person, remark, input_time, 
112
-      edit_time, data_status)
114
+      edit_time, data_status, commit_people, commit_time)
113
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
115
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
114
       #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{hyDate,jdbcType=TIMESTAMP}, 
116
       #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{hyDate,jdbcType=TIMESTAMP}, 
115
       #{hyPerson,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
117
       #{hyPerson,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
116
-      #{editTime,jdbcType=TIMESTAMP},#{dataStatus,jdbcType=VARCHAR})
118
+      #{editTime,jdbcType=TIMESTAMP},#{dataStatus,jdbcType=VARCHAR}, #{commitPeople,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP})
117
   </insert>
119
   </insert>
118
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheck" >
120
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheck" >
119
     insert into storage_water_check
121
     insert into storage_water_check
@@ -151,6 +153,12 @@
151
       <if test="dataStatus != null">
153
       <if test="dataStatus != null">
152
         data_status,
154
         data_status,
153
       </if>
155
       </if>
156
+      <if test="commitPeople != null">
157
+        commit_people,
158
+      </if>
159
+      <if test="commitTime != null">
160
+        commit_time,
161
+      </if>
154
     </trim>
162
     </trim>
155
     <trim prefix="values (" suffix=")" suffixOverrides="," >
163
     <trim prefix="values (" suffix=")" suffixOverrides="," >
156
       <if test="id != null" >
164
       <if test="id != null" >
@@ -186,6 +194,12 @@
186
       <if test="dataStatus != null">
194
       <if test="dataStatus != null">
187
         #{dataStatus,jdbcType=VARCHAR},
195
         #{dataStatus,jdbcType=VARCHAR},
188
       </if>
196
       </if>
197
+      <if test="commitPeople != null">
198
+        #{commitPeople,jdbcType=VARCHAR},
199
+      </if>
200
+      <if test="commitTime != null">
201
+        #{commitTime,jdbcType=TIMESTAMP},
202
+      </if>
189
     </trim>
203
     </trim>
190
   </insert>
204
   </insert>
191
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" resultType="java.lang.Integer" >
205
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" resultType="java.lang.Integer" >
@@ -230,6 +244,12 @@
230
       <if test="record.dataStatus != null" >
244
       <if test="record.dataStatus != null" >
231
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
245
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
232
       </if>
246
       </if>
247
+      <if test="record.commitPeople != null">
248
+        commit_people = #{record.commitPeople,jdbcType=VARCHAR},
249
+      </if>
250
+      <if test="record.commitTime != null">
251
+        commit_time = #{record.commitTime,jdbcType=TIMESTAMP},
252
+      </if>
233
     </set>
253
     </set>
234
     <if test="_parameter != null" >
254
     <if test="_parameter != null" >
235
       <include refid="Update_By_Example_Where_Clause" />
255
       <include refid="Update_By_Example_Where_Clause" />
@@ -247,7 +267,9 @@
247
       remark = #{record.remark,jdbcType=VARCHAR},
267
       remark = #{record.remark,jdbcType=VARCHAR},
248
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
268
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
249
       edit_time = #{record.editTime,jdbcType=TIMESTAMP},
269
       edit_time = #{record.editTime,jdbcType=TIMESTAMP},
250
-      data_status = #{record.dataStatus,jdbcType=VARCHAR}
270
+      data_status = #{record.dataStatus,jdbcType=VARCHAR},
271
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
272
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
251
     <if test="_parameter != null" >
273
     <if test="_parameter != null" >
252
       <include refid="Update_By_Example_Where_Clause" />
274
       <include refid="Update_By_Example_Where_Clause" />
253
     </if>
275
     </if>
@@ -285,6 +307,12 @@
285
       <if test="dataStatus != null" >
307
       <if test="dataStatus != null" >
286
         data_status = #{dataStatus,jdbcType=VARCHAR},
308
         data_status = #{dataStatus,jdbcType=VARCHAR},
287
       </if>
309
       </if>
310
+      <if test="commitPeople != null">
311
+        commit_people = #{commitPeople,jdbcType=VARCHAR},
312
+      </if>
313
+      <if test="commitTime != null">
314
+        commit_time = #{commitTime,jdbcType=TIMESTAMP},
315
+      </if>
288
     </set>
316
     </set>
289
     where id = #{id,jdbcType=VARCHAR}
317
     where id = #{id,jdbcType=VARCHAR}
290
   </update>
318
   </update>
@@ -299,7 +327,9 @@
299
       remark = #{remark,jdbcType=VARCHAR},
327
       remark = #{remark,jdbcType=VARCHAR},
300
       input_time = #{inputTime,jdbcType=TIMESTAMP},
328
       input_time = #{inputTime,jdbcType=TIMESTAMP},
301
       edit_time = #{editTime,jdbcType=TIMESTAMP},
329
       edit_time = #{editTime,jdbcType=TIMESTAMP},
302
-      data_status = #{dataStatus,jdbcType=VARCHAR}
330
+      data_status = #{dataStatus,jdbcType=VARCHAR},
331
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
332
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
303
     where id = #{id,jdbcType=VARCHAR}
333
     where id = #{id,jdbcType=VARCHAR}
304
   </update>
334
   </update>
305
 </mapper>
335
 </mapper>

+ 10 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageWaterCheck.java

@@ -1,5 +1,9 @@
1
 package com.chinaitop.depot.storage.model;
1
 package com.chinaitop.depot.storage.model;
2
 
2
 
3
+import com.fasterxml.jackson.annotation.JsonFormat;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
3
 import java.util.Date;
7
 import java.util.Date;
4
 
8
 
5
 public class StorageWaterCheck {
9
 public class StorageWaterCheck {
@@ -29,6 +33,12 @@ public class StorageWaterCheck {
29
 
33
 
30
     private String blueAlert;//绿色警报
34
     private String blueAlert;//绿色警报
31
 
35
 
36
+    @Getter @Setter
37
+    private String commitPeople;// 提交人
38
+    @Getter @Setter
39
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
40
+    private Date commitTime;// 提交时间
41
+
32
     /**
42
     /**
33
      * 主键唯一ID
43
      * 主键唯一ID
34
      * @return id 主键唯一ID
44
      * @return id 主键唯一ID