fanxw преди 1 година
родител
ревизия
0042dc89a4

+ 20 - 5
src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageCerealsCardMapper.xml

@@ -51,6 +51,7 @@
51
     <result column="cj" property="cj" jdbcType="VARCHAR" />
51
     <result column="cj" property="cj" jdbcType="VARCHAR" />
52
     <result column="remark" property="remark" jdbcType="VARCHAR" />
52
     <result column="remark" property="remark" jdbcType="VARCHAR" />
53
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
53
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
54
+    <result column="bzq" property="bzq" jdbcType="TIMESTAMP" />
54
   </resultMap>
55
   </resultMap>
55
   <sql id="Example_Where_Clause" >
56
   <sql id="Example_Where_Clause" >
56
     <where >
57
     <where >
@@ -116,7 +117,7 @@
116
     in_width, grain_line_heigth, bin_volume, storeman_code, storeman_name, lypz_code,
117
     in_width, grain_line_heigth, bin_volume, storeman_code, storeman_name, lypz_code,
117
     lypz_name, lydj_code, lydj_name, rksj, scrq, lycd_code, lycd_name, lysl, js, bzgg,
118
     lypz_name, lydj_code, lydj_name, rksj, scrq, lycd_code, lycd_name, lysl, js, bzgg,
118
     pinp, ccfs_code, ccfs_name, jkrq, org_id, image_url, spare_one, spare_two, spare_three,
119
     pinp, ccfs_code, ccfs_name, jkrq, org_id, image_url, spare_one, spare_two, spare_three,
119
-    spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark, data_status
120
+    spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark, data_status, bzq
120
   </sql>
121
   </sql>
121
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" >
122
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" >
122
     select
123
     select
@@ -162,7 +163,7 @@
162
       ccfs_name, jkrq, org_id,
163
       ccfs_name, jkrq, org_id,
163
       image_url, spare_one, spare_two,
164
       image_url, spare_one, spare_two,
164
       spare_three, spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark,
165
       spare_three, spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark,
165
-      data_status)
166
+      data_status, bzq)
166
     values (#{id,jdbcType=VARCHAR}, #{storehouseCode,jdbcType=VARCHAR}, #{storehouseName,jdbcType=VARCHAR},
167
     values (#{id,jdbcType=VARCHAR}, #{storehouseCode,jdbcType=VARCHAR}, #{storehouseName,jdbcType=VARCHAR},
167
       #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{storehouseType,jdbcType=VARCHAR},
168
       #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{storehouseType,jdbcType=VARCHAR},
168
       #{storehouseTypeName,jdbcType=VARCHAR}, #{buildDate,jdbcType=TIMESTAMP}, #{wallCode,jdbcType=VARCHAR},
169
       #{storehouseTypeName,jdbcType=VARCHAR}, #{buildDate,jdbcType=TIMESTAMP}, #{wallCode,jdbcType=VARCHAR},
@@ -178,7 +179,7 @@
178
       #{spareThree,jdbcType=VARCHAR}, #{spareFour,jdbcType=VARCHAR}, #{spareFive,jdbcType=VARCHAR},
179
       #{spareThree,jdbcType=VARCHAR}, #{spareFour,jdbcType=VARCHAR}, #{spareFive,jdbcType=VARCHAR},
179
       #{sfgd,jdbcType=VARCHAR}, #{gdsj,jdbcType=TIMESTAMP}, #{zhycsj,jdbcType=TIMESTAMP}, #{jkr,jdbcType=VARCHAR}, 
180
       #{sfgd,jdbcType=VARCHAR}, #{gdsj,jdbcType=TIMESTAMP}, #{zhycsj,jdbcType=TIMESTAMP}, #{jkr,jdbcType=VARCHAR}, 
180
       #{updatetime,jdbcType=TIMESTAMP}, #{lqss,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, #{cj,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
181
       #{updatetime,jdbcType=TIMESTAMP}, #{lqss,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, #{cj,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
181
-      #{dataStatus,jdbcType=VARCHAR}
182
+      #{dataStatus,jdbcType=VARCHAR}, #{bzq,jdbcType=TIMESTAMP}
182
       )
183
       )
183
   </insert>
184
   </insert>
184
   <insert id="insertSelective" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCard" >
185
   <insert id="insertSelective" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCard" >
@@ -331,6 +332,9 @@
331
       <if test="dataStatus != null">
332
       <if test="dataStatus != null">
332
         data_status,
333
         data_status,
333
       </if>
334
       </if>
335
+      <if test="bzq != null">
336
+        bzq,
337
+      </if>
334
     </trim>
338
     </trim>
335
     <trim prefix="values (" suffix=")" suffixOverrides="," >
339
     <trim prefix="values (" suffix=")" suffixOverrides="," >
336
       <if test="id != null" >
340
       <if test="id != null" >
@@ -480,6 +484,9 @@
480
       <if test="dataStatus != null">
484
       <if test="dataStatus != null">
481
         #{dataStatus,jdbcType=VARCHAR},
485
         #{dataStatus,jdbcType=VARCHAR},
482
       </if>
486
       </if>
487
+      <if test="bzq != null">
488
+        #{bzq,jdbcType=TIMESTAMP},
489
+      </if>
483
     </trim>
490
     </trim>
484
   </insert>
491
   </insert>
485
   <select id="countByExample" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" resultType="java.lang.Integer" >
492
   <select id="countByExample" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" resultType="java.lang.Integer" >
@@ -638,6 +645,9 @@
638
       <if test="record.dataStatus != null">
645
       <if test="record.dataStatus != null">
639
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
646
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
640
       </if>
647
       </if>
648
+      <if test="record.bzq != null">
649
+        bzq = #{record.bzq,jdbcType=TIMESTAMP},
650
+      </if>
641
     </set>
651
     </set>
642
     <if test="_parameter != null" >
652
     <if test="_parameter != null" >
643
       <include refid="Update_By_Example_Where_Clause" />
653
       <include refid="Update_By_Example_Where_Clause" />
@@ -693,7 +703,8 @@
693
       ywlx = #{record.ywlx,jdbcType=VARCHAR},
703
       ywlx = #{record.ywlx,jdbcType=VARCHAR},
694
       cj = #{record.cj,jdbcType=VARCHAR},
704
       cj = #{record.cj,jdbcType=VARCHAR},
695
       remark = #{record.remark,jdbcType=VARCHAR},
705
       remark = #{record.remark,jdbcType=VARCHAR},
696
-      data_status = #{record.dataStatus,jdbcType=VARCHAR}
706
+      data_status = #{record.dataStatus,jdbcType=VARCHAR},
707
+      bzq = #{record.bzq,jdbcType=TIMESTAMP}
697
     <if test="_parameter != null" >
708
     <if test="_parameter != null" >
698
       <include refid="Update_By_Example_Where_Clause" />
709
       <include refid="Update_By_Example_Where_Clause" />
699
     </if>
710
     </if>
@@ -845,6 +856,9 @@
845
       <if test="dataStatus != null">
856
       <if test="dataStatus != null">
846
         data_status = #{dataStatus,jdbcType=VARCHAR},
857
         data_status = #{dataStatus,jdbcType=VARCHAR},
847
       </if>
858
       </if>
859
+      <if test="bzq != null">
860
+        bzq = #{bzq,jdbcType=TIMESTAMP},
861
+      </if>
848
     </set>
862
     </set>
849
     where id = #{id,jdbcType=VARCHAR}
863
     where id = #{id,jdbcType=VARCHAR}
850
   </update>
864
   </update>
@@ -897,7 +911,8 @@
897
       ywlx = #{ywlx,jdbcType=VARCHAR},
911
       ywlx = #{ywlx,jdbcType=VARCHAR},
898
       cj = #{cj,jdbcType=VARCHAR},
912
       cj = #{cj,jdbcType=VARCHAR},
899
       remark = #{remark,jdbcType=VARCHAR},
913
       remark = #{remark,jdbcType=VARCHAR},
900
-      data_status = #{dataStatus,jdbcType=VARCHAR}
914
+      data_status = #{dataStatus,jdbcType=VARCHAR},
915
+      bzq = #{bzq,jdbcType=TIMESTAMP}
901
     where id = #{id,jdbcType=VARCHAR}
916
     where id = #{id,jdbcType=VARCHAR}
902
   </update>
917
   </update>
903
 
918
 

+ 19 - 0
src/main/java/com/chinaitop/depot/grainSituationCard/model/StorageCerealsCard.java

@@ -108,6 +108,9 @@ public class StorageCerealsCard {
108
 
108
 
109
     private String dataStatus;
109
     private String dataStatus;
110
 
110
 
111
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
112
+    private Date bzq;
113
+
111
     /**
114
     /**
112
      * 成品粮粮情卡主键
115
      * 成品粮粮情卡主键
113
      * @return id 成品粮粮情卡主键
116
      * @return id 成品粮粮情卡主键
@@ -892,4 +895,20 @@ public class StorageCerealsCard {
892
 		this.dataStatus = dataStatus;
895
 		this.dataStatus = dataStatus;
893
 	}
896
 	}
894
 
897
 
898
+	/**
899
+	 * 保质期
900
+	 * @return
901
+	 */
902
+	public Date getBzq() {
903
+		return bzq;
904
+	}
905
+
906
+	/**
907
+	 * 保质期
908
+	 * @param bzq
909
+	 */
910
+	public void setBzq(Date bzq) {
911
+		this.bzq = bzq;
912
+	}
913
+
895
 }
914
 }