仟样-提交人

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

@@ -108,6 +108,8 @@
     <result column="zhycsj" property="zhycsj" jdbcType="TIMESTAMP" />
     
     <result column="process_state" property="processState" jdbcType="INTEGER" />
+    <result column="commit_people" property="commitPeople" jdbcType="VARCHAR" />
+    <result column="commit_time" property="commitTime" jdbcType="TIMESTAMP" />
 
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -185,7 +187,7 @@
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
     butyl_phenol, flag_type,
     jylb,qfrq,ypsl,dbsl,ypdj,
-    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj,process_state
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj,process_state, commit_people, commit_time
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     select
@@ -250,7 +252,7 @@
       lead, total_arsenic, aflatoxin,
       jylb,qfrq,ypsl,dbsl,ypdj,
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
-      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj,process_state)
+      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj,process_state, commit_people, commit_time)
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -284,7 +286,7 @@
       #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
       #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
       #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR}, #{zhycsj,jdbcType=TIMESTAMP},
-      #{processState,jdbcType=INTEGER})
+      #{processState,jdbcType=INTEGER}, #{commitPeople,jdbcType=VARCHAR}, #{commitTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     insert into storage_qualitycheck
@@ -600,6 +602,12 @@
       <if test="processState != null">
         process_state,
       </if>
+      <if test="commitPeople != null">
+        commit_people,
+      </if>
+      <if test="commitTime != null">
+        commit_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -909,6 +917,12 @@
       <if test="processState != null" >
         #{processState,jdbcType=INTEGER},
       </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.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1229,6 +1243,12 @@
       <if test="record.processState != null" >
         process_state = #{record.processState,jdbcType=INTEGER},
       </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" />
@@ -1325,20 +1345,22 @@
       quailtycard_id = #{record.quailtycardId,jdbcType=VARCHAR},
       butyl_phenol = #{record.butylPhenol,jdbcType=VARCHAR},
       flag_type = #{record.flagType,jdbcType=INTEGER},
-    jylb= #{record.jylb,jdbcType=VARCHAR},
-    qfrq= #{record.qfrq,jdbcType=TIMESTAMP},
-    ypsl= #{record.ypsl,jdbcType=VARCHAR},
-    dbsl= #{record.dbsl,jdbcType=VARCHAR},
-    ypdj= #{record.ypdj,jdbcType=VARCHAR},
-    qyqy= #{record.qyqy,jdbcType=VARCHAR},
-    qydbh= #{record.qydbh,jdbcType=VARCHAR},
-    zblb= #{record.zblb,jdbcType=VARCHAR},
-    jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
-    ypbh= #{record.ypbh,jdbcType=VARCHAR},
-    sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
+      jylb= #{record.jylb,jdbcType=VARCHAR},
+      qfrq= #{record.qfrq,jdbcType=TIMESTAMP},
+      ypsl= #{record.ypsl,jdbcType=VARCHAR},
+      dbsl= #{record.dbsl,jdbcType=VARCHAR},
+      ypdj= #{record.ypdj,jdbcType=VARCHAR},
+      qyqy= #{record.qyqy,jdbcType=VARCHAR},
+      qydbh= #{record.qydbh,jdbcType=VARCHAR},
+      zblb= #{record.zblb,jdbcType=VARCHAR},
+      jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
+      ypbh= #{record.ypbh,jdbcType=VARCHAR},
+      sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
       file_route = #{record.fileRoute,jdbcType=VARCHAR},
       zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
-      process_state = #{record.processState,jdbcType=INTEGER}
+      process_state = #{record.processState,jdbcType=INTEGER},
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1652,6 +1674,12 @@
       <if test="processState != null" >
         process_state = #{processState,jdbcType=INTEGER},
       </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=INTEGER}
   </update>
@@ -1758,7 +1786,9 @@
       ypdj= #{record.ypdj,jdbcType=VARCHAR},
       file_route = #{fileRoute,jdbcType=VARCHAR},
       zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
-      process_state = #{processState,jdbcType=INTEGER}
+      process_state = #{processState,jdbcType=INTEGER},
+      commit_people = #{commitPeople,jdbcType=VARCHAR},
+      commit_time = #{commitTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -1858,7 +1888,7 @@
     sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
     sqk.butyl_phenol, sqk.flag_type,
     sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
-     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj,sqk.process_state
+     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj,sqk.process_state, sqk.commit_people, sqk.commit_time
   </sql>
 
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

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

@@ -1,6 +1,8 @@
 package com.chinaitop.depot.storage.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -75,6 +77,13 @@ public class StorageQualitycheck {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date zhycsj;
 
+    @Getter @Setter
+    private String commitPeople;// 提交人
+    @Getter @Setter
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date commitTime;// 提交时间
+
+
     /**
      * 质量检查类型:0:初检或自检 1：验收 2：春秋普查 3：出库检验 4：日常检验(春秋普查) 5：第三方检查,6:入仓初检(入库检验)
      * @return