gaodd před 2 roky
rodič
revize
efdb4df379

+ 22 - 5
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -106,6 +106,8 @@
106 106
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
107 107
     <result column="file_route" property="fileRoute" jdbcType="VARCHAR" />
108 108
     <result column="zhycsj" property="zhycsj" jdbcType="TIMESTAMP" />
109
+    
110
+    <result column="process_state" property="processState" jdbcType="INTEGER" />
109 111
 
110 112
   </resultMap>
111 113
   <sql id="Example_Where_Clause" >
@@ -183,7 +185,7 @@
183 185
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
184 186
     butyl_phenol, flag_type,
185 187
     jylb,qfrq,ypsl,dbsl,ypdj,
186
-    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj
188
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj,process_state
187 189
   </sql>
188 190
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
189 191
     select
@@ -248,7 +250,7 @@
248 250
       lead, total_arsenic, aflatoxin,
249 251
       jylb,qfrq,ypsl,dbsl,ypdj,
250 252
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
251
-      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj)
253
+      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj,process_state)
252 254
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
253 255
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
254 256
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -281,7 +283,8 @@
281 283
       #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR},
282 284
       #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
283 285
       #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
284
-      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR}, #{zhycsj,jdbcType=TIMESTAMP})
286
+      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR}, #{zhycsj,jdbcType=TIMESTAMP},
287
+      #{processState,jdbcType=INTEGER})
285 288
   </insert>
286 289
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
287 290
     insert into storage_qualitycheck
@@ -594,6 +597,9 @@
594 597
       <if test="zhycsj != null">
595 598
         zhycsj,
596 599
       </if>
600
+      <if test="processState != null">
601
+        process_state,
602
+      </if>
597 603
     </trim>
598 604
     <trim prefix="values (" suffix=")" suffixOverrides="," >
599 605
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -900,6 +906,9 @@
900 906
       <if test="zhycsj != null">
901 907
         #{zhycsj,jdbcType=TIMESTAMP},
902 908
       </if>
909
+      <if test="processState != null" >
910
+        #{processState,jdbcType=INTEGER},
911
+      </if>
903 912
     </trim>
904 913
   </insert>
905 914
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1217,6 +1226,9 @@
1217 1226
       <if test="record.zhycsj != null">
1218 1227
         zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
1219 1228
       </if>
1229
+      <if test="record.processState != null" >
1230
+        process_state = #{record.processState,jdbcType=INTEGER},
1231
+      </if>
1220 1232
     </set>
1221 1233
     <if test="_parameter != null" >
1222 1234
       <include refid="Update_By_Example_Where_Clause" />
@@ -1325,7 +1337,8 @@
1325 1337
     ypbh= #{record.ypbh,jdbcType=VARCHAR},
1326 1338
     sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1327 1339
       file_route = #{record.fileRoute,jdbcType=VARCHAR},
1328
-      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP}
1340
+      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
1341
+      process_state = #{record.processState,jdbcType=INTEGER}
1329 1342
     <if test="_parameter != null" >
1330 1343
       <include refid="Update_By_Example_Where_Clause" />
1331 1344
     </if>
@@ -1636,6 +1649,9 @@
1636 1649
       <if test="zhycsj != null">
1637 1650
         zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
1638 1651
       </if>
1652
+      <if test="processState != null" >
1653
+        process_state = #{processState,jdbcType=INTEGER},
1654
+      </if>
1639 1655
     </set>
1640 1656
     where id = #{id,jdbcType=INTEGER}
1641 1657
   </update>
@@ -1741,7 +1757,8 @@
1741 1757
       sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1742 1758
       ypdj= #{record.ypdj,jdbcType=VARCHAR},
1743 1759
       file_route = #{fileRoute,jdbcType=VARCHAR},
1744
-      zhycsj = #{zhycsj,jdbcType=TIMESTAMP}
1760
+      zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
1761
+      process_state = #{processState,jdbcType=INTEGER}
1745 1762
     where id = #{id,jdbcType=INTEGER}
1746 1763
   </update>
1747 1764
 

+ 12 - 1
src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -8,8 +8,19 @@ import java.util.Date;
8 8
 import java.util.List;
9 9
 
10 10
 public class StorageQualitycheck {
11
+	
12
+	private Integer processState;
13
+	
11 14
 
12
-    private String jylb;//检验类别
15
+    public Integer getProcessState() {
16
+		return processState;
17
+	}
18
+
19
+	public void setProcessState(Integer processState) {
20
+		this.processState = processState;
21
+	}
22
+
23
+	private String jylb;//检验类别
13 24
 
14 25
     private Date qfrq;//qfrq签发日期
15 26