质检管理下新增国家局字段

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

@@ -101,6 +101,11 @@
     <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
     <result column="qysj" property="qysj" jdbcType="TIMESTAMP" />
+    <result column="jylb" property="jylb" jdbcType="VARCHAR" />
+    <result column="qfrq" property="qfrq" jdbcType="TIMESTAMP" />
+    <result column="ypsl" property="ypsl" jdbcType="VARCHAR" />
+    <result column="dbsl" property="dbsl" jdbcType="VARCHAR" />
+    <result column="ypdj" property="ypdj" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <!--
@@ -190,7 +195,8 @@
     inspection_standard_basis, quality, seal_date, seal_status, auth_code, org_id, history_status, 
     intermixing_rate, smelltaste, transparency, peroxide_value, smoke_point, reeze_test, 
     residual_solvent, lead, total_arsenic, aflatoxin, butyl_phenol, updatetime, zblb, 
-    qydbh, qyqy, jdrxm, ypbh, sfzcccnx, qysj
+    qydbh, qyqy, jdrxm, ypbh, sfzcccnx, qysj,
+    jylb,qfrq,ypsl,dbsl,ypdj
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     <!--
@@ -279,7 +285,8 @@
       reeze_test, residual_solvent, lead, 
       total_arsenic, aflatoxin, butyl_phenol, 
       updatetime, zblb, qydbh, 
-      qyqy, jdrxm, ypbh, 
+      qyqy, jdrxm, ypbh,
+      jylb,qfrq,ypsl,dbsl,ypdj,
       sfzcccnx, qysj)
     values (#{id,jdbcType=INTEGER}, #{tankId,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
       #{warehouseId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, 
@@ -312,8 +319,9 @@
       #{reezeTest,jdbcType=VARCHAR}, #{residualSolvent,jdbcType=VARCHAR}, #{lead,jdbcType=VARCHAR}, 
       #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{zblb,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR}, 
-      #{qyqy,jdbcType=VARCHAR}, #{jdrxm,jdbcType=VARCHAR}, #{ypbh,jdbcType=VARCHAR}, 
-      #{sfzcccnx,jdbcType=VARCHAR}, #{qysj,jdbcType=TIMESTAMP})
+      #{qyqy,jdbcType=VARCHAR}, #{jdrxm,jdbcType=VARCHAR}, #{ypbh,jdbcType=VARCHAR},
+    #{jylb,jdbcType=VARCHAR},#{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
+    #{sfzcccnx,jdbcType=VARCHAR}, #{qysj,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     <!--
@@ -605,6 +613,21 @@
       <if test="qysj != null" >
         qysj,
       </if>
+      <if test="jylb != null" >
+        jylb,
+      </if>
+      <if test="qfrq != null" >
+        qfrq,
+      </if>
+      <if test="ypsl != null" >
+        ypsl,
+      </if>
+      <if test="dbsl != null" >
+        dbsl,
+      </if>
+      <if test="ypdj != null" >
+        ypdj,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -889,6 +912,21 @@
       <if test="qysj != null" >
         #{qysj,jdbcType=TIMESTAMP},
       </if>
+      <if test="jylb != null" >
+        #{jylb,jdbcType=VARCHAR},
+      </if>
+      <if test="qfrq != null" >
+        #{qfrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ypsl != null" >
+        #{ypsl,jdbcType=VARCHAR},
+      </if>
+      <if test="dbsl != null" >
+        #{dbsl,jdbcType=VARCHAR},
+      </if>
+      <if test="ypdj != null" >
+        #{ypdj,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1192,6 +1230,21 @@
       <if test="record.qysj != null" >
         qysj = #{record.qysj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.jylb != null" >
+        jylb = #{record.jylb,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qfrq != null" >
+        qfrq = #{record.qfrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.ypsl != null" >
+        ypsl = #{record.ypsl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dbsl != null" >
+        dbsl = #{record.dbsl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ypdj != null" >
+        ypdj = #{record.ypdj,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -1297,7 +1350,12 @@
       jdrxm = #{record.jdrxm,jdbcType=VARCHAR},
       ypbh = #{record.ypbh,jdbcType=VARCHAR},
       sfzcccnx = #{record.sfzcccnx,jdbcType=VARCHAR},
-      qysj = #{record.qysj,jdbcType=TIMESTAMP}
+      qysj = #{record.qysj,jdbcType=TIMESTAMP},
+      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}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1589,6 +1647,21 @@
       <if test="qysj != null" >
         qysj = #{qysj,jdbcType=TIMESTAMP},
       </if>
+      <if test="jylb != null" >
+        jylb = #{jylb,jdbcType=VARCHAR},
+      </if>
+      <if test="qfrq != null" >
+        qfrq = #{qfrq,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ypsl != null" >
+        ypsl = #{ypsl,jdbcType=VARCHAR},
+      </if>
+      <if test="dbsl != null" >
+        dbsl = #{dbsl,jdbcType=VARCHAR},
+      </if>
+      <if test="ypdj != null" >
+        ypdj = #{ypdj,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1691,8 +1764,13 @@
       jdrxm = #{jdrxm,jdbcType=VARCHAR},
       ypbh = #{ypbh,jdbcType=VARCHAR},
       sfzcccnx = #{sfzcccnx,jdbcType=VARCHAR},
-      qysj = #{qysj,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=INTEGER}
+      qysj = #{qysj,jdbcType=TIMESTAMP},
+      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}
+      where id = #{id,jdbcType=INTEGER}
   </update>
   
   <select id="getHouseIdList" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
@@ -1740,7 +1818,7 @@
     ORDER BY
     id DESC
     ) a
-    GROUP BY a.warehouse_id
+    GROUP BY /*a.warehouse_id*/a.id, a.warehouse_id, a.level, a.sub_type_detailed
     HAVING
     <if test="level != null">
       level = #{level}
@@ -1797,7 +1875,8 @@
     sqk.damage_ratio, sqk.hot_damage_ratio, sqk.husked_rice_weight, sqk.reviewer, sqk.apply_check_time, sqk.check_time_type,
     sqk.check_result_time, sqk.store_quality, sqk.is_pest, sqk.inspection_standard_basis, sqk.quality, sqk.seal_date,
     sqk.seal_status, sqk.auth_code, sqk.org_id, sqk.history_status, sqk.smoke_point, sqk.residual_solvent, sqk.transparency,
-    sqk.zblb,sqk.qydbh,sqk.qysj,sqk.qyqy,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx
+    sqk.zblb,sqk.qydbh,sqk.qysj,sqk.qyqy,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
+    sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj
     <!--云南新增的字段，先注释掉方便调试-->
     /*, sqk.intermixing_rate,sqk.smelltaste,sqk.transparency,sqk.peroxide_value,
     sqk.smoke_point,sqk.reeze_test,sqk.residual_solvent,sqk.lead,sqk.total_arsenic,sqk.aflatoxin,sqk.butyl_phenol*/
@@ -1862,7 +1941,7 @@
         and sqk.check_result = #{checkResult}
       </if>
     </where>
-    GROUP BY sqk.id
+    /*GROUP BY sqk.id*/
     order by sqk.id desc
   </select>
 
@@ -2004,7 +2083,14 @@
         and bswd.type = "notice"
       </if>
     </where>
-      GROUP BY sqk.id,bswd.in_price
+      GROUP BY sqk.id,bswd.in_price, sqk.house_id, sqk.warehouse_id,
+    bs.storeHouse_name,
+    bs.keeping_way,
+    bs.grain_heigth,
+    bs.bin_volume,
+    bs.depot_name,
+    bw.warehouse_name,
+    bswd.id
       order by sqk.id desc
   </select>