质检的国家局新增字段

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

@@ -91,6 +91,20 @@
     <result column="quailtycard_id" property="quailtycardId" jdbcType="VARCHAR" />
     <result column="butyl_phenol" property="butylPhenol" jdbcType="VARCHAR" />
     <result column="flag_type" property="flagType" jdbcType="INTEGER" />
+
+    <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" />
+
+    <result column="qyqy" property="qyqy" jdbcType="VARCHAR" />
+    <result column="qydbh" property="qydbh" jdbcType="VARCHAR" />
+    <result column="zblb" property="zblb" jdbcType="VARCHAR" />
+    <result column="jdrxm" property="jdrxm" jdbcType="VARCHAR" />
+    <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
+    <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -165,7 +179,9 @@
     store_quality, is_pest, 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, quailtycard_id, 
-    butyl_phenol, flag_type
+    butyl_phenol, flag_type,
+    jylb,qfrq,ypsl,dbsl,ypdj,
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     select
@@ -227,7 +243,9 @@
       org_id, history_status, intermixing_rate, 
       smelltaste, transparency, peroxide_value, 
       smoke_point, reeze_test, residual_solvent, 
-      lead, total_arsenic, aflatoxin, 
+      lead, total_arsenic, aflatoxin,
+      jylb,qfrq,ypsl,dbsl,ypdj,
+      qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
       quailtycard_id, butyl_phenol, flag_type)
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
       #{warehouseId,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER}, 
@@ -258,7 +276,9 @@
       #{orgId,jdbcType=INTEGER}, #{historyStatus,jdbcType=INTEGER}, #{intermixingRate,jdbcType=VARCHAR}, 
       #{smelltaste,jdbcType=VARCHAR}, #{transparency,jdbcType=VARCHAR}, #{peroxideValue,jdbcType=VARCHAR}, 
       #{smokePoint,jdbcType=VARCHAR}, #{reezeTest,jdbcType=VARCHAR}, #{residualSolvent,jdbcType=VARCHAR}, 
-      #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR}, 
+      #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR},
+      #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
+      #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
       #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
@@ -532,6 +552,41 @@
       <if test="flagType != null" >
         flag_type,
       </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>
+      <if test="qyqy != null" >
+        qyqy,
+      </if>
+      <if test="qydbh != null" >
+        qydbh,
+      </if>
+      <if test="zblb != null" >
+        zblb,
+      </if>
+      <if test="jdrxm != null" >
+        jdrxm,
+      </if>
+      <if test="ypbh != null" >
+        ypbh,
+      </if>
+      <if test="sfzcccnx != null" >
+        sfzcccnx,
+      </if>
+
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -799,6 +854,39 @@
       <if test="flagType != null" >
         #{flagType,jdbcType=INTEGER},
       </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>
+      <if test="qyqy != null" >
+        #{qyqy,jdbcType=VARCHAR},
+      </if>
+      <if test="qydbh != null" >
+        #{qydbh,jdbcType=VARCHAR},
+      </if>
+      <if test="zblb != null" >
+        #{zblb,jdbcType=VARCHAR},
+      </if>
+      <if test="jdrxm != null" >
+        #{jdrxm,jdbcType=VARCHAR},
+      </if>
+      <if test="ypbh != null" >
+        #{ypbh,jdbcType=VARCHAR},
+      </if>
+      <if test="sfzcccnx != null" >
+        #{sfzcccnx,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1077,6 +1165,40 @@
       <if test="record.flagType != null" >
         flag_type = #{record.flagType,jdbcType=INTEGER},
       </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>
+      <if test="record.qyqy != null" >
+        qyqy = #{record.qyqy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qydbh != null" >
+        qydbh = #{record.qydbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zblb != null" >
+        zblb = #{record.zblb,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jdrxm != null" >
+        jdrxm = #{record.jdrxm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ypbh != null" >
+        ypbh = #{record.ypbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sfzcccnx != null" >
+        sfzcccnx = #{record.sfzcccnx,jdbcType=VARCHAR},
+      </if>
+
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -1173,6 +1295,17 @@
       quailtycard_id = #{record.quailtycardId,jdbcType=VARCHAR},
       butyl_phenol = #{record.butylPhenol,jdbcType=VARCHAR},
       flag_type = #{record.flagType,jdbcType=INTEGER},
+    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},
+    qyqy= #{record.qyqy,jdbcType=VARCHAR},
+    qydbh= #{record.qydbh,jdbcType=VARCHAR},
+    zblb= #{record.zblb,jdbcType=VARCHAR},
+    jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
+    ypbh= #{record.ypbh,jdbcType=VARCHAR},
+    sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1444,6 +1577,40 @@
       <if test="flagType != null" >
         flag_type = #{flagType,jdbcType=INTEGER},
       </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>
+      <if test="qyqy != null" >
+        qyqy = #{qyqy,jdbcType=VARCHAR},
+      </if>
+      <if test="qydbh != null" >
+        qydbh = #{qydbh,jdbcType=VARCHAR},
+      </if>
+      <if test="zblb != null" >
+        zblb = #{zblb,jdbcType=VARCHAR},
+      </if>
+      <if test="jdrxm != null" >
+        jdrxm = #{jdrxm,jdbcType=VARCHAR},
+      </if>
+      <if test="ypbh != null" >
+        ypbh = #{ypbh,jdbcType=VARCHAR},
+      </if>
+      <if test="sfzcccnx != null" >
+        sfzcccnx = #{sfzcccnx,jdbcType=VARCHAR},
+      </if>
+
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1536,7 +1703,18 @@
       aflatoxin = #{aflatoxin,jdbcType=VARCHAR},
       quailtycard_id = #{quailtycardId,jdbcType=VARCHAR},
       butyl_phenol = #{butylPhenol,jdbcType=VARCHAR},
-      flag_type = #{flagType,jdbcType=INTEGER}
+      flag_type = #{flagType,jdbcType=INTEGER},
+      jylb= #{record.jylb,jdbcType=VARCHAR},
+      qfrq= #{record.qfrq,jdbcType=TIMESTAMP},
+      ypsl= #{record.ypsl,jdbcType=VARCHAR},
+      dbsl= #{record.dbsl,jdbcType=VARCHAR},
+      qyqy= #{record.qyqy,jdbcType=VARCHAR},
+      qydbh= #{record.qydbh,jdbcType=VARCHAR},
+      zblb= #{record.zblb,jdbcType=VARCHAR},
+      jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
+      ypbh= #{record.ypbh,jdbcType=VARCHAR},
+      sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
+      ypdj= #{record.ypdj,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -1634,7 +1812,9 @@
     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.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.quailtycard_id,
-    sqk.butyl_phenol, sqk.flag_type
+    sqk.butyl_phenol, sqk.flag_type,
+    sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
+     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj
   </sql>
 
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

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

@@ -29,6 +29,11 @@
     <result column="storehouse_name" property="houseName" jdbcType="VARCHAR" />
     <result column="warehouse_id" property="warehouseId" jdbcType="VARCHAR" />
     <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <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" >
     <where >
@@ -90,7 +95,8 @@
   </sql>
   <sql id="Base_Column_List" >
     zljcid, yyywid, jclx, pz, xxdpz, dj, jyrq, jyjg, kqmc, cfmc, hwmc, jyr, jydw, rksj, 
-    sl, cd, bgy, shnd, qyr, qyrq, jybgcjrq, sjly, zzjgdm
+    sl, cd, bgy, shnd, qyr, qyrq, jybgcjrq, sjly, zzjgdm,
+    jylb,qfrq,ypsl,dbsl,ypdj
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.XwkZljcExample" >
     select
@@ -112,6 +118,7 @@
     replace(to_char(to_date(T1.jyrq,'yyyy年mm月dd日'),'yyyy-mm-dd'),'00','20') jyrq,
     T1.jyjg, T1.kqmc, T1.cfmc, T1.hwmc, T1.jyr, T1.jydw, T1.rksj,
     T1.sl, T1.cd, T1.bgy, T1.shnd, T1.qyr, T1.qyrq, T1.jybgcjrq, T1.sjly, T1.zzjgdm,
+    T1.jylb,T1.qfrq,T1.ypsl,T1.dbsl,T1.ypdj,
     T2.warehouse_id, T2.warehouse_name, T3.storehouse_id, T3.storehouse_name
     from xwk_zljc T1
     left join basic_warehouse T2 on T1.hwmc = T2.hwbm
@@ -134,14 +141,19 @@
       jyjg, kqmc, cfmc, hwmc, 
       jyr, jydw, rksj, sl, 
       cd, bgy, shnd, qyr, 
-      qyrq, jybgcjrq, sjly, 
+      qyrq, jybgcjrq, sjly,
+      jylb,qfrq,ypsl,dbsl,ypdj,
       zzjgdm)
     values (#{zljcid,jdbcType=VARCHAR}, #{yyywid,jdbcType=VARCHAR}, #{jclx,jdbcType=VARCHAR}, 
       #{pz,jdbcType=VARCHAR}, #{xxdpz,jdbcType=VARCHAR}, #{dj,jdbcType=VARCHAR}, #{jyrq,jdbcType=VARCHAR}, 
       #{jyjg,jdbcType=VARCHAR}, #{kqmc,jdbcType=VARCHAR}, #{cfmc,jdbcType=VARCHAR}, #{hwmc,jdbcType=VARCHAR}, 
       #{jyr,jdbcType=VARCHAR}, #{jydw,jdbcType=VARCHAR}, #{rksj,jdbcType=VARCHAR}, #{sl,jdbcType=VARCHAR}, 
       #{cd,jdbcType=VARCHAR}, #{bgy,jdbcType=VARCHAR}, #{shnd,jdbcType=VARCHAR}, #{qyr,jdbcType=VARCHAR}, 
-      #{qyrq,jdbcType=VARCHAR}, #{jybgcjrq,jdbcType=VARCHAR}, #{sjly,jdbcType=VARCHAR}, 
+      #{qyrq,jdbcType=VARCHAR}, #{jybgcjrq,jdbcType=VARCHAR}, #{sjly,jdbcType=VARCHAR},
+
+      #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},
+      #{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
+
       #{zzjgdm,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.XwkZljc" >
@@ -216,6 +228,22 @@
       <if test="zzjgdm != null" >
         zzjgdm,
       </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="zljcid != null" >
@@ -287,6 +315,21 @@
       <if test="zzjgdm != null" >
         #{zzjgdm,jdbcType=VARCHAR},
       </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.XwkZljcExample" resultType="java.lang.Integer" >
@@ -367,6 +410,21 @@
       <if test="record.zzjgdm != null" >
         zzjgdm = #{record.zzjgdm,jdbcType=VARCHAR},
       </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" />
@@ -396,7 +454,12 @@
     qyrq = #{record.qyrq,jdbcType=VARCHAR},
     jybgcjrq = #{record.jybgcjrq,jdbcType=VARCHAR},
     sjly = #{record.sjly,jdbcType=VARCHAR},
-    zzjgdm = #{record.zzjgdm,jdbcType=VARCHAR}
+    zzjgdm = #{record.zzjgdm,jdbcType=VARCHAR},
+    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>
@@ -470,6 +533,21 @@
       <if test="zzjgdm != null" >
         zzjgdm = #{zzjgdm,jdbcType=VARCHAR},
       </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 zljcid = #{zljcid,jdbcType=VARCHAR}
   </update>
@@ -496,7 +574,12 @@
       qyrq = #{qyrq,jdbcType=VARCHAR},
       jybgcjrq = #{jybgcjrq,jdbcType=VARCHAR},
       sjly = #{sjly,jdbcType=VARCHAR},
-      zzjgdm = #{zzjgdm,jdbcType=VARCHAR}
+      zzjgdm = #{zzjgdm,jdbcType=VARCHAR},
+      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 zljcid = #{zljcid,jdbcType=VARCHAR}
   </update>
 
@@ -506,6 +589,7 @@
     replace(to_char(to_date(T1.jyrq,'yyyy年mm月dd日'),'yyyy-mm-dd'),'00','20') jyrq,
     T1.jyjg, T1.kqmc, T1.cfmc, T1.hwmc, T1.jyr, T1.jydw, T1.rksj,
     T1.sl, T1.cd, T1.bgy, T1.shnd, T1.qyr, T1.qyrq, T1.jybgcjrq, T1.sjly, T1.zzjgdm,
+    T1.jylb,T1.qfrq,T1.ypsl,T1.dbsl,T1.ypdj,
     T2.warehouse_id, T2.warehouse_name, T3.storehouse_id, T3.storehouse_name
     from xwk_zljc T1
     left join basic_warehouse T2 on T1.hwmc = T2.hwbm

src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -6,6 +6,22 @@ import java.util.Date;
 import java.util.List;
 
 public class StorageQualitycheck {
+
+    private String jylb;//检验类别
+    private Date qfrq;//qfrq签发日期
+    private String ypsl;//ypsl样品数量
+    private String dbsl;//dbsl代表数量
+    private String ypdj;//ypdj样品等级
+
+
+
+    private String qyqy;//扦样区域
+    private String qydbh;//扦样单编号
+    private String zblb;//指标类别
+    private String jdrxm;//监督人姓名
+    private String ypbh;//样品编号
+    private String sfzcccnx;//是否正常存储年限
+
     private Integer id;
 
     private Integer depotId;
@@ -20,15 +36,15 @@ public class StorageQualitycheck {
 
     private Integer subTypeDetailed;
 
-    private Date checkTime;
+    private Date checkTime;//检验日期
 
-    private String checkResult;
+    private String checkResult;//检验结果0:合格  1：不合格
 
-    private String checker;
+    private String checker;//检验人
 
-    private Integer level;
+    private Integer level;//等级
 
-    private String capacity;
+    private String capacity;//容量
 
     private String water;
 
@@ -72,7 +88,7 @@ public class StorageQualitycheck {
 
     private String isFirstchecklevelRight;
 
-    private String acceptUnite;
+    private String acceptUnite;//检验单位
 
     private Date inputTime;
 
@@ -132,19 +148,19 @@ public class StorageQualitycheck {
 
     private String huskedRiceWeight;
 
-    private String reviewer;
+    private String reviewer;//审核人
 
     private Date applyCheckTime;
 
     private String checkTimeType;
 
-    private Date checkResultTime;
+    private Date checkResultTime;//检验报告出具日期zblb
 
-    private String storeQuality;
+    private String storeQuality;//指标结果判定（可多选）
 
     private String isPest;
 
-    private String inspectionStandardBasis;
+    private String inspectionStandardBasis;//检验标准依据qfrq
 
     private String quality;
 
@@ -193,9 +209,9 @@ public class StorageQualitycheck {
 
     private Integer foodbasicinfoId;
 
-    private String chooserOrgan;
+    private String chooserOrgan;//扦样机构
 
-    private Integer flagType;
+    private Integer flagType;//保存:1,提交:2
 
     //封仓业务字段
     private String disperseCapacity;
@@ -206,7 +222,53 @@ public class StorageQualitycheck {
     private Integer notice;
 
     List<Integer> typeList = new ArrayList<Integer>();
+    public String getQyqy() {
+        return qyqy;
+    }
+
+    public void setQyqy(String qyqy) {
+        this.qyqy = qyqy;
+    }
+
+    public String getQydbh() {
+        return qydbh;
+    }
+
+    public void setQydbh(String qydbh) {
+        this.qydbh = qydbh;
+    }
 
+    public String getZblb() {
+        return zblb;
+    }
+
+    public void setZblb(String zblb) {
+        this.zblb = zblb;
+    }
+
+    public String getJdrxm() {
+        return jdrxm;
+    }
+
+    public void setJdrxm(String jdrxm) {
+        this.jdrxm = jdrxm;
+    }
+
+    public String getYpbh() {
+        return ypbh;
+    }
+
+    public void setYpbh(String ypbh) {
+        this.ypbh = ypbh;
+    }
+
+    public String getSfzcccnx() {
+        return sfzcccnx;
+    }
+
+    public void setSfzcccnx(String sfzcccnx) {
+        this.sfzcccnx = sfzcccnx;
+    }
     //业务字段
     public String getStorehouseName() {
         return storehouseName;
@@ -247,7 +309,45 @@ public class StorageQualitycheck {
     public void setWarehouseCode(String warehouseCode) {
         this.warehouseCode = warehouseCode;
     }
+    public String getJylb() {
+        return jylb;
+    }
+
+    public void setJylb(String jylb) {
+        this.jylb = jylb;
+    }
+
+    public Date getQfrq() {
+        return qfrq;
+    }
+
+    public void setQfrq(Date qfrq) {
+        this.qfrq = qfrq;
+    }
 
+    public String getYpsl() {
+        return ypsl;
+    }
+
+    public void setYpsl(String ypsl) {
+        this.ypsl = ypsl;
+    }
+
+    public String getDbsl() {
+        return dbsl;
+    }
+
+    public void setDbsl(String dbsl) {
+        this.dbsl = dbsl;
+    }
+
+    public String getYpdj() {
+        return ypdj;
+    }
+
+    public void setYpdj(String ypdj) {
+        this.ypdj = ypdj;
+    }
     /**
      * 质量检查信息表
      * @return id 质量检查信息表

src/main/java/com/chinaitop/depot/storage/model/XwkZljc.java

@@ -1,6 +1,16 @@
 package com.chinaitop.depot.storage.model;
 
+import java.util.Date;
+
 public class XwkZljc {
+
+
+    private String jylb;//检验类别
+    private Date qfrq;//qfrq签发日期
+    private String ypsl;//ypsl样品数量
+    private String dbsl;//dbsl代表数量
+    private String ypdj;//ypdj样品等级
+
     private String zljcid;
 
     private String yyywid;
@@ -54,6 +64,48 @@ public class XwkZljc {
     private String warehouseId;
     private String warehouseName;
 
+
+
+
+    public String getJylb() {
+        return jylb;
+    }
+
+    public void setJylb(String jylb) {
+        this.jylb = jylb;
+    }
+    public Date getQfrq() {
+        return qfrq;
+    }
+
+    public void setQfrq(Date qfrq) {
+        this.qfrq = qfrq;
+    }
+
+    public String getYpsl() {
+        return ypsl;
+    }
+
+    public void setYpsl(String ypsl) {
+        this.ypsl = ypsl;
+    }
+
+    public String getDbsl() {
+        return dbsl;
+    }
+
+    public void setDbsl(String dbsl) {
+        this.dbsl = dbsl;
+    }
+
+    public String getYpdj() {
+        return ypdj;
+    }
+
+    public void setYpdj(String ypdj) {
+        this.ypdj = ypdj;
+    }
+
     /**
      * 质量检测id
      * @return zljcid 质量检测id