1

src/main/java/com/chinaitop/depot/grainSituationCard/mapper/StorageCerealsCardMapper.xml

@@ -51,6 +51,7 @@
     <result column="cj" property="cj" jdbcType="VARCHAR" />
     <result column="remark" property="remark" jdbcType="VARCHAR" />
     <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
+    <result column="bzq" property="bzq" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -116,7 +117,7 @@
     in_width, grain_line_heigth, bin_volume, storeman_code, storeman_name, lypz_code,
     lypz_name, lydj_code, lydj_name, rksj, scrq, lycd_code, lycd_name, lysl, js, bzgg,
     pinp, ccfs_code, ccfs_name, jkrq, org_id, image_url, spare_one, spare_two, spare_three,
-    spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark, data_status
+    spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark, data_status, bzq
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" >
     select
@@ -162,7 +163,7 @@
       ccfs_name, jkrq, org_id,
       image_url, spare_one, spare_two,
       spare_three, spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark,
-      data_status)
+      data_status, bzq)
     values (#{id,jdbcType=VARCHAR}, #{storehouseCode,jdbcType=VARCHAR}, #{storehouseName,jdbcType=VARCHAR},
       #{warehouseCode,jdbcType=VARCHAR}, #{warehouseName,jdbcType=VARCHAR}, #{storehouseType,jdbcType=VARCHAR},
       #{storehouseTypeName,jdbcType=VARCHAR}, #{buildDate,jdbcType=TIMESTAMP}, #{wallCode,jdbcType=VARCHAR},
@@ -178,7 +179,7 @@
       #{spareThree,jdbcType=VARCHAR}, #{spareFour,jdbcType=VARCHAR}, #{spareFive,jdbcType=VARCHAR},
       #{sfgd,jdbcType=VARCHAR}, #{gdsj,jdbcType=TIMESTAMP}, #{zhycsj,jdbcType=TIMESTAMP}, #{jkr,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{lqss,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, #{cj,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
-      #{dataStatus,jdbcType=VARCHAR}
+      #{dataStatus,jdbcType=VARCHAR}, #{bzq,jdbcType=TIMESTAMP}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCard" >
@@ -331,6 +332,9 @@
       <if test="dataStatus != null">
         data_status,
       </if>
+      <if test="bzq != null">
+        bzq,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -480,6 +484,9 @@
       <if test="dataStatus != null">
         #{dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="bzq != null">
+        #{bzq,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" resultType="java.lang.Integer" >
@@ -638,6 +645,9 @@
       <if test="record.dataStatus != null">
         data_status = #{record.dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="record.bzq != null">
+        bzq = #{record.bzq,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -693,7 +703,8 @@
       ywlx = #{record.ywlx,jdbcType=VARCHAR},
       cj = #{record.cj,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
-      data_status = #{record.dataStatus,jdbcType=VARCHAR}
+      data_status = #{record.dataStatus,jdbcType=VARCHAR},
+      bzq = #{record.bzq,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -845,6 +856,9 @@
       <if test="dataStatus != null">
         data_status = #{dataStatus,jdbcType=VARCHAR},
       </if>
+      <if test="bzq != null">
+        bzq = #{bzq,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -897,7 +911,8 @@
       ywlx = #{ywlx,jdbcType=VARCHAR},
       cj = #{cj,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
-      data_status = #{dataStatus,jdbcType=VARCHAR}
+      data_status = #{dataStatus,jdbcType=VARCHAR},
+      bzq = #{bzq,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

src/main/java/com/chinaitop/depot/grainSituationCard/model/StorageCerealsCard.java

@@ -108,6 +108,9 @@ public class StorageCerealsCard {
 
     private String dataStatus;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date bzq;
+
     /**
      * 成品粮粮情卡主键
      * @return id 成品粮粮情卡主键
@@ -892,4 +895,20 @@ public class StorageCerealsCard {
 		this.dataStatus = dataStatus;
 	}
 
+	/**
+	 * 保质期
+	 * @return
+	 */
+	public Date getBzq() {
+		return bzq;
+	}
+
+	/**
+	 * 保质期
+	 * @param bzq
+	 */
+	public void setBzq(Date bzq) {
+		this.bzq = bzq;
+	}
+
 }