各种修改

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

@@ -284,7 +284,10 @@ public class StorageQualitycheckController {
         if(StringUtils.isNoneBlank(warehouseId)){
             qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
         }
-        qualityCheck.setTypeUpdate("1");///查找验收质量管理的信息
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        List<Integer> idList = new ArrayList<Integer>();
+        idList.add(1);
+        qualityCheck.setTypeList(idList);
 
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
 
@@ -323,7 +326,13 @@ public class StorageQualitycheckController {
                 qualityCheckExample.setWarehouseId(warehouseId);
             }
             if(StringUtils.isNotBlank(type)){
-                qualityCheckExample.setTypeUpdate(type);//传入查找的质量类型
+            	//根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+                String[] idArray = type.split(",");
+                List<Integer> idList = new ArrayList<Integer>();
+                for (String id : idArray) {
+                    idList.add(Integer.parseInt(id));
+                }
+                qualityCheckExample.setTypeList(idList);
             }
 
             if(StringUtils.isNotBlank(sealStatus)){
@@ -551,10 +560,15 @@ public class StorageQualitycheckController {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
     	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
-        if (StringUtils.isNotBlank(checktype)){
-            qualityCheck.setTypeUpdate(checktype);
+    	if (StringUtils.isNotBlank(checktype)){
+            String[] idArray = checktype.split(",");
+            List<Integer> idList = new ArrayList<Integer>();
+            for (String id : idArray) {
+                idList.add(Integer.parseInt(id));
+            }
+            qualityCheck.setTypeList(idList);
         }
-        
+
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         qualityCheck.setSealStatus("0");

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

@@ -105,6 +105,7 @@
     <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
     <result column="file_route" property="fileRoute" jdbcType="VARCHAR" />
+    <result column="zhycsj" property="zhycsj" jdbcType="TIMESTAMP" />
 
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -182,7 +183,7 @@
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
     butyl_phenol, flag_type,
     jylb,qfrq,ypsl,dbsl,ypdj,
-    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
     select
@@ -247,7 +248,7 @@
       lead, total_arsenic, aflatoxin,
       jylb,qfrq,ypsl,dbsl,ypdj,
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
-      quailtycard_id, butyl_phenol, flag_type, file_route)
+      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj)
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -280,7 +281,7 @@
       #{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}, #{fileRoute,jdbcType=VARCHAR})
+      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR}, #{zhycsj,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
     insert into storage_qualitycheck
@@ -590,6 +591,9 @@
       <if test="fileRoute != null" >
         fileRoute,
       </if>
+      <if test="zhycsj != null">
+        zhycsj,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -893,6 +897,9 @@
       <if test="fileRoute != null" >
         #{fileRoute,jdbcType=VARCHAR},
       </if>
+      <if test="zhycsj != null">
+        #{zhycsj,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1207,6 +1214,9 @@
       <if test="record.fileRoute != null" >
         file_route = #{record.fileRoute,jdbcType=VARCHAR},
       </if>
+      <if test="record.zhycsj != null">
+        zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -1314,7 +1324,8 @@
     jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
     ypbh= #{record.ypbh,jdbcType=VARCHAR},
     sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
-      file_route = #{record.fileRoute,jdbcType=VARCHAR}
+      file_route = #{record.fileRoute,jdbcType=VARCHAR},
+      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1622,6 +1633,9 @@
       <if test="fileRoute != null" >
         file_route = #{fileRoute,jdbcType=VARCHAR},
       </if>
+      <if test="zhycsj != null">
+        zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1726,7 +1740,8 @@
       ypbh= #{record.ypbh,jdbcType=VARCHAR},
       sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
       ypdj= #{record.ypdj,jdbcType=VARCHAR},
-        file_route = #{fileRoute,jdbcType=VARCHAR}
+      file_route = #{fileRoute,jdbcType=VARCHAR},
+      zhycsj = #{zhycsj,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -1826,7 +1841,7 @@
     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.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
-     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route
+     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj
   </sql>
 
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

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

@@ -54,6 +54,9 @@ public class StorageQualitycheck {
 
     private Integer levelUpdate;//等级
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date zhycsj;
+
     public String getTypeUpdate() {
         return typeUpdate;
     }
@@ -124,6 +127,7 @@ public class StorageQualitycheck {
 
     private String acceptUnite;//检验单位
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inputTime;
 
     private String numberUpdate;//number_update
@@ -2035,4 +2039,20 @@ public class StorageQualitycheck {
     public void setFileRoute(String fileRoute) {
         this.fileRoute = fileRoute;
     }
+    
+    /**
+	 * 最后一车时间(入库时间)
+	 * @return
+	 */
+	public Date getZhycsj() {
+		return zhycsj;
+	}
+
+	/**
+	 * 最后一车时间(入库时间)
+	 * @param zhycsj
+	 */
+	public void setZhycsj(Date zhycsj) {
+		this.zhycsj = zhycsj;
+	}
 }