水分检验

src/main/java/com/chinaitop/depot/storage/mapper/StorageWaterCheckMapper.xml

@@ -13,6 +13,8 @@
     <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
     <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
+    <result column="commit_people" property="commitPeople" jdbcType="VARCHAR" />
+    <result column="commit_time" property="commitTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -73,7 +75,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time, data_status
+    id, org_id, house_id, ware_id, lspz, hy_date, hy_person, remark, input_time, edit_time, data_status, commit_people, commit_time
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" >
     select
@@ -109,11 +111,11 @@
     insert into storage_water_check (id, org_id, house_id, 
       ware_id, lspz, hy_date, 
       hy_person, remark, input_time, 
-      edit_time, data_status)
+      edit_time, data_status, commit_people, commit_time)
     values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, 
       #{wareId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{hyDate,jdbcType=TIMESTAMP}, 
       #{hyPerson,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{inputTime,jdbcType=TIMESTAMP}, 
-      #{editTime,jdbcType=TIMESTAMP},#{dataStatus,jdbcType=VARCHAR})
+      #{editTime,jdbcType=TIMESTAMP},#{dataStatus,jdbcType=VARCHAR}, #{commitPeople,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheck" >
     insert into storage_water_check
@@ -151,6 +153,12 @@
       <if test="dataStatus != null">
         data_status,
       </if>
+      <if test="commitPeople != null">
+        commit_people,
+      </if>
+      <if test="commitTime != null">
+        commit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -186,6 +194,12 @@
       <if test="dataStatus != null">
         #{dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="commitPeople != null">
+        #{commitPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="commitTime != null">
+        #{commitTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageWaterCheckExample" resultType="java.lang.Integer" >
@@ -230,6 +244,12 @@
       <if test="record.dataStatus != null" >
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.commitPeople != null">
+        commit_people = #{record.commitPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commitTime != null">
+        commit_time = #{record.commitTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -247,7 +267,9 @@
       remark = #{record.remark,jdbcType=VARCHAR},
       input_time = #{record.inputTime,jdbcType=TIMESTAMP},
       edit_time = #{record.editTime,jdbcType=TIMESTAMP},
-      data_status = #{record.dataStatus,jdbcType=VARCHAR}
+      data_status = #{record.dataStatus,jdbcType=VARCHAR},
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -285,6 +307,12 @@
       <if test="dataStatus != null" >
         data_status = #{dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="commitPeople != null">
+        commit_people = #{commitPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="commitTime != null">
+        commit_time = #{commitTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -299,7 +327,9 @@
       remark = #{remark,jdbcType=VARCHAR},
       input_time = #{inputTime,jdbcType=TIMESTAMP},
       edit_time = #{editTime,jdbcType=TIMESTAMP},
-      data_status = #{dataStatus,jdbcType=VARCHAR}
+      data_status = #{dataStatus,jdbcType=VARCHAR},
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/storage/model/StorageWaterCheck.java

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