1

pom.xml

@@ -88,10 +88,10 @@
             <version>3.9</version>
         </dependency>
         <!-- 日志-->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-        </dependency>
+<!--         <dependency> -->
+<!--             <groupId>ch.qos.logback</groupId> -->
+<!--             <artifactId>logback-classic</artifactId> -->
+<!--         </dependency> -->
         <!-- springCloud dependency -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>

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

@@ -44,6 +44,13 @@
     <result column="sfgd" property="sfgd" jdbcType="VARCHAR" />
     <result column="gdsj" property="gdsj" jdbcType="TIMESTAMP" />
     <result column="zhycsj" property="zhycsj" jdbcType="TIMESTAMP" />
+    <result column="jkr" property="jkr" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="lqss" property="lqss" jdbcType="VARCHAR" />
+    <result column="ywlx" property="ywlx" jdbcType="VARCHAR" />
+    <result column="cj" property="cj" jdbcType="VARCHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -109,7 +116,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
+    spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark, data_status
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" >
     select
@@ -154,8 +161,8 @@
       bzgg, pinp, ccfs_code,
       ccfs_name, jkrq, org_id,
       image_url, spare_one, spare_two,
-      spare_three, spare_four, spare_five, sfgd, gdsj, zhycsj
-      )
+      spare_three, spare_four, spare_five, sfgd, gdsj, zhycsj, jkr, updatetime, lqss, ywlx, cj, remark,
+      data_status)
     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},
@@ -169,7 +176,9 @@
       #{ccfsName,jdbcType=VARCHAR}, #{jkrq,jdbcType=TIMESTAMP}, #{orgId,jdbcType=VARCHAR},
       #{imageUrl,jdbcType=VARCHAR}, #{spareOne,jdbcType=VARCHAR}, #{spareTwo,jdbcType=VARCHAR},
       #{spareThree,jdbcType=VARCHAR}, #{spareFour,jdbcType=VARCHAR}, #{spareFive,jdbcType=VARCHAR},
-      #{sfgd,jdbcType=VARCHAR}, #{gdsj,jdbcType=TIMESTAMP}, #{zhycsj,jdbcType=TIMESTAMP}
+      #{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}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCard" >
@@ -301,6 +310,27 @@
       <if test="zhycsj != null">
         zhycsj,
       </if>
+      <if test="jkr != null">
+        jkr,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+      <if test="lqss != null">
+        lqss,
+      </if>
+      <if test="ywlx != null">
+        ywlx,
+      </if>
+      <if test="cj != null">
+        cj,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="dataStatus != null">
+        data_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -429,6 +459,27 @@
       <if test="zhycsj != null">
         #{zhycsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="jkr != null">
+        #{jkr,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="lqss != null">
+        #{lqss,jdbcType=VARCHAR},
+      </if>
+      <if test="ywlx != null">
+        #{ywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="cj != null">
+        #{cj,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="dataStatus != null">
+        #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.grainSituationCard.model.StorageCerealsCardExample" resultType="java.lang.Integer" >
@@ -566,6 +617,27 @@
       <if test="record.zhycsj != null">
         zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.jkr != null">
+        jkr = #{record.jkr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.lqss != null">
+        lqss = #{record.lqss,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ywlx != null">
+        ywlx = #{record.ywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cj != null">
+        cj = #{record.cj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dataStatus != null">
+        data_status = #{record.dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -614,7 +686,14 @@
       spare_five = #{record.spareFive,jdbcType=VARCHAR},
       sfgd = #{record.sfgd,jdbcType=VARCHAR},
       gdsj = #{record.gdsj,jdbcType=TIMESTAMP},
-      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP}
+      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
+      jkr = #{record.jkr,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      lqss = #{record.lqss,jdbcType=VARCHAR},
+      ywlx = #{record.ywlx,jdbcType=VARCHAR},
+      cj = #{record.cj,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      data_status = #{record.dataStatus,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -745,6 +824,27 @@
       <if test="zhycsj != null">
         zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
       </if>
+      <if test="jkr != null">
+        jkr = #{jkr,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="lqss != null">
+        lqss = #{lqss,jdbcType=VARCHAR},
+      </if>
+      <if test="ywlx != null">
+        ywlx = #{ywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="cj != null">
+        cj = #{cj,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="dataStatus != null">
+        data_status = #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -790,7 +890,14 @@
       spare_five = #{spareFive,jdbcType=VARCHAR},
       sfgd = #{sfgd,jdbcType=VARCHAR},
       gdsj = #{gdsj,jdbcType=TIMESTAMP},
-      zhycsj = #{zhycsj,jdbcType=TIMESTAMP}
+      zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
+      jkr = #{jkr,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      lqss = #{lqss,jdbcType=VARCHAR},
+      ywlx = #{ywlx,jdbcType=VARCHAR},
+      cj = #{cj,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      data_status = #{dataStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -843,13 +950,9 @@
                 scc.spare_four,
                 scc.spare_five,
                 scc.zhycsj
-            from
-                basic_keeper bk right join basic_keeper_house bkh on
-                bkh.keeper_id = bk.id
-                and bk.org_id = bkh.org_id right join storage_cereals_card scc on
-                scc.org_id = bk.org_id
-                and scc.org_id = bkh.org_id
-                and scc.spare_one = bkh.house_id
+            from basic_keeper bk 
+            right join basic_keeper_house bkh on bkh.keeper_id = bk.id and bk.org_id = bkh.org_id 
+            right join storage_cereals_card scc on scc.org_id = bk.org_id and scc.org_id = bkh.org_id and scc.spare_one = bkh.house_id
             where
                 scc.id = #{id,jdbcType=VARCHAR}
         ) t

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

@@ -93,6 +93,21 @@ public class StorageCerealsCard {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date zhycsj;
 
+    private String jkr;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatetime;
+
+    private String lqss;
+
+    private String ywlx;
+
+    private String cj;
+
+    private String remark;
+
+    private String dataStatus;
+
     /**
      * 成品粮粮情卡主键
      * @return id 成品粮粮情卡主键
@@ -764,4 +779,117 @@ public class StorageCerealsCard {
 	public void setZhycsj(Date zhycsj) {
 		this.zhycsj = zhycsj;
 	}
+
+	/**
+	 * 建卡人
+	 * @return
+	 */
+	public String getJkr() {
+		return jkr;
+	}
+
+	/**
+	 * 建卡人
+	 * @param jkr
+	 */
+	public void setJkr(String jkr) {
+		this.jkr = jkr;
+	}
+
+	/**
+	 * 最后修改时间
+	 * @return
+	 */
+	public Date getUpdatetime() {
+		return updatetime;
+	}
+
+	/**
+	 * 最后修改时间
+	 * @param updatetime
+	 */
+	public void setUpdatetime(Date updatetime) {
+		this.updatetime = updatetime;
+	}
+
+	/**
+	 * 粮权所属
+	 * @return
+	 */
+	public String getLqss() {
+		return lqss;
+	}
+
+	/**
+	 * 粮权所属
+	 * @param lqss
+	 */
+	public void setLqss(String lqss) {
+		this.lqss = lqss;
+	}
+
+	/**
+	 * 业务类型
+	 * @return
+	 */
+	public String getYwlx() {
+		return ywlx;
+	}
+
+	/**
+	 * 业务类型
+	 * @param ywlx
+	 */
+	public void setYwlx(String ywlx) {
+		this.ywlx = ywlx;
+	}
+
+	/**
+	 * 厂家
+	 * @return
+	 */
+	public String getCj() {
+		return cj;
+	}
+
+	/**
+	 * 厂家
+	 * @param cj
+	 */
+	public void setCj(String cj) {
+		this.cj = cj;
+	}
+
+	/**
+	 * 备注
+	 * @return
+	 */
+	public String getRemark() {
+		return remark;
+	}
+
+	/**
+	 * 备注
+	 * @param remark
+	 */
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	/**
+	 * 数据状态(0:保存,1:提交)
+	 * @return
+	 */
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	/**
+	 * 数据状态(0:保存,1:提交)
+	 * @param dataStatus
+	 */
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
+
 }