1

src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -154,7 +154,7 @@ public class StorageQualitycheckController {
         }else{
         	qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         }
-       
+
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         //qualityCheck.setSealStatus("0");
         if (pageNum!=null && pageSize!=null) {

src/main/java/com/chinaitop/depot/storage/controller/StorageWarterCheckController.java

@@ -107,7 +107,6 @@ public class StorageWarterCheckController {
 		/* 查询水分检验相关数据  */
 		if (null == id || "".equals(id)) {
 			storageWaterCheck = new StorageWaterCheck();
-			storageWaterCheck.setHyDate(new Date());
 			storageWarterFixedPoint_list = new ArrayList<StorageWarterFixedPoint>();
 			storageWarterMobilePoint_list = new ArrayList<StorageWarterMobilePoint>();
 			StorageWarterFixedPoint fixedPoint = new StorageWarterFixedPoint();

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

@@ -74,6 +74,7 @@
     <result column="rice_yield" property="riceYield" jdbcType="VARCHAR" />
     <result column="imperfectgrains_scab_qtbl" property="imperfectgrainsScabQtbl" jdbcType="VARCHAR" />
     <result column="color_smell" property="colorSmell" jdbcType="VARCHAR" />
+    <result column="wgxt" property="wgxt" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -147,7 +148,7 @@
     avg_length, rice_grains, brokenRice_total, brokenRice_big, brokenRice_small, machiningAccuracy, 
     chalkiness, machiningAccuracy_essence, machiningAccuracy_suitable, amylose, ash_content, 
     coarseness, gluten, silt_content, magnetic_metal, input_one, input_two, input_three, 
-    input_four,sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell
+    input_four,sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell,wgxt
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" >
     select
@@ -205,7 +206,7 @@
       coarseness, gluten, silt_content, 
       magnetic_metal, input_one, input_two, 
       input_three, input_four,
-      sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell)
+      sieve_residue,rice_yield,imperfectgrains_scab_qtbl,color_smell,wgxt)
     values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{unitWeight,jdbcType=VARCHAR}, 
       #{impurityTotal,jdbcType=VARCHAR}, #{impurityInorganic,jdbcType=VARCHAR}, #{impurityOrganic,jdbcType=VARCHAR}, 
       #{impurityBranPowder,jdbcType=VARCHAR}, #{imperfectgrainsTotal,jdbcType=VARCHAR}, 
@@ -232,7 +233,7 @@
       #{magneticMetal,jdbcType=VARCHAR}, #{inputOne,jdbcType=VARCHAR}, #{inputTwo,jdbcType=VARCHAR}, 
       #{inputThree,jdbcType=VARCHAR}, #{inputFour,jdbcType=VARCHAR},
       #{sieveResidue,jdbcType=VARCHAR}, #{riceYield,jdbcType=VARCHAR}, #{imperfectgrainsScabQtbl,jdbcType=VARCHAR}
-      , #{colorSmell,jdbcType=VARCHAR})
+      , #{colorSmell,jdbcType=VARCHAR}, #{wgxt,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspection" >
     insert into storage_qualitycheck_inspection
@@ -451,6 +452,9 @@
        <if test="colorSmell != null">
         color_smell,
       </if>
+      <if test="wgxt != null">
+        wgxt,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK_INSPECTION.nextVal,
@@ -667,6 +671,9 @@
       <if test="colorSmell != null">
         #{colorSmell,jdbcType=VARCHAR},
       </if>
+      <if test="wgxt != null">
+        #{wgxt,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckInspectionExample" resultType="java.lang.Integer" >
@@ -894,6 +901,9 @@
       <if test="record.colorSmell != null">
         color_smell = #{record.colorSmell,jdbcType=VARCHAR},
       </if>
+      <if test="record.wgxt != null">
+        wgxt = #{record.wgxt,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -972,7 +982,8 @@
       sieve_residue = #{record.sieveResidue,jdbcType=VARCHAR},
       rice_yield = #{record.riceYield,jdbcType=VARCHAR},
       imperfectgrains_scab_qtbl = #{record.imperfectgrainsScabQtbl,jdbcType=VARCHAR},
-      color_smell = #{record.colorSmell,jdbcType=VARCHAR}
+      color_smell = #{record.colorSmell,jdbcType=VARCHAR},
+      wgxt = #{record.wgxt,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1193,6 +1204,9 @@
       <if test="colorSmell != null">
         color_smell = #{colorSmell,jdbcType=VARCHAR},
       </if>
+      <if test="wgxt != null">
+        wgxt = #{wgxt,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1268,7 +1282,8 @@
       sieve_residue = #{sieveResidue,jdbcType=VARCHAR},
       rice_yield = #{riceYield,jdbcType=VARCHAR},
       imperfectgrains_scab_qtbl = #{imperfectgrainsScabQtbl,jdbcType=VARCHAR},
-      color_smell = #{colorSmell,jdbcType=VARCHAR}
+      color_smell = #{colorSmell,jdbcType=VARCHAR},
+      wgxt = #{wgxt,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -2171,7 +2171,8 @@
       sqi.coarseness,
       sqi.gluten,
       sqi.silt_content,
-      sqi.magnetic_metal
+      sqi.magnetic_metal,
+      sqi.wgxt
   FROM
       storage_qualitycheck sqk
       LEFT JOIN basic_storehouse bs ON bs.storehouse_id = sqk.house_id

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

@@ -155,6 +155,7 @@ public class StorageQualitycheckInspection {
     
     private String imperfectgrainsScabQtbl; //其它病粒%2021-08-19
 
+    private String wgxt;//外观形态
 
     public String getSieveResidue() {
         return sieveResidue;
@@ -1273,4 +1274,20 @@ public class StorageQualitycheckInspection {
 	public void setImperfectgrainsScabQtbl(String imperfectgrainsScabQtbl) {
 		this.imperfectgrainsScabQtbl = imperfectgrainsScabQtbl;
 	}
+
+	/**
+	 * 外观形态
+	 * @return
+	 */
+	public String getWgxt() {
+		return wgxt;
+	}
+
+	/**
+	 * 外观形态
+	 * @param wgxt
+	 */
+	public void setWgxt(String wgxt) {
+		this.wgxt = wgxt;
+	}
 }

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

@@ -17,14 +17,17 @@ public class StorageWaterCheck {
 
     private Integer lspz;
 
+    @JsonFormat(pattern="yyyy-MM-dd", timezone="GMT+8")
     private Date hyDate;
 
     private String hyPerson;
 
     private String remark;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date inputTime;
 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date editTime;
 
     private String dataStatus;