浏览代码

各种修改

fanxw 2 年之前
父节点
当前提交
0ebadb3290

+ 19 - 5
src/main/java/com/chinaitop/depot/storage/controller/StorageQualitycheckController.java

@@ -284,7 +284,10 @@ public class StorageQualitycheckController {
284
         if(StringUtils.isNoneBlank(warehouseId)){
284
         if(StringUtils.isNoneBlank(warehouseId)){
285
             qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
285
             qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
286
         }
286
         }
287
-        qualityCheck.setTypeUpdate("1");///查找验收质量管理的信息
287
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
288
+        List<Integer> idList = new ArrayList<Integer>();
289
+        idList.add(1);
290
+        qualityCheck.setTypeList(idList);
288
 
291
 
289
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
292
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
290
 
293
 
@@ -323,7 +326,13 @@ public class StorageQualitycheckController {
323
                 qualityCheckExample.setWarehouseId(warehouseId);
326
                 qualityCheckExample.setWarehouseId(warehouseId);
324
             }
327
             }
325
             if(StringUtils.isNotBlank(type)){
328
             if(StringUtils.isNotBlank(type)){
326
-                qualityCheckExample.setTypeUpdate(type);//传入查找的质量类型
329
+            	//根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
330
+                String[] idArray = type.split(",");
331
+                List<Integer> idList = new ArrayList<Integer>();
332
+                for (String id : idArray) {
333
+                    idList.add(Integer.parseInt(id));
334
+                }
335
+                qualityCheckExample.setTypeList(idList);
327
             }
336
             }
328
 
337
 
329
             if(StringUtils.isNotBlank(sealStatus)){
338
             if(StringUtils.isNotBlank(sealStatus)){
@@ -551,10 +560,15 @@ public class StorageQualitycheckController {
551
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
560
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
552
     	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
561
     	List<List<StorageQualitycheck>> list = new ArrayList<List<StorageQualitycheck>>();
553
         //根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
562
         //根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
554
-        if (StringUtils.isNotBlank(checktype)){
555
-            qualityCheck.setTypeUpdate(checktype);
563
+    	if (StringUtils.isNotBlank(checktype)){
564
+            String[] idArray = checktype.split(",");
565
+            List<Integer> idList = new ArrayList<Integer>();
566
+            for (String id : idArray) {
567
+                idList.add(Integer.parseInt(id));
568
+            }
569
+            qualityCheck.setTypeList(idList);
556
         }
570
         }
557
-        
571
+
558
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
572
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
559
         //查询出未封仓的质量管理信息 封仓状态:0:未封仓,1:已封仓
573
         //查询出未封仓的质量管理信息 封仓状态:0:未封仓,1:已封仓
560
         qualityCheck.setSealStatus("0");
574
         qualityCheck.setSealStatus("0");

+ 21 - 6
src/main/java/com/chinaitop/depot/storage/mapper/StorageQualitycheckMapper.xml

@@ -105,6 +105,7 @@
105
     <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
105
     <result column="ypbh" property="ypbh" jdbcType="VARCHAR" />
106
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
106
     <result column="sfzcccnx" property="sfzcccnx" jdbcType="VARCHAR" />
107
     <result column="file_route" property="fileRoute" jdbcType="VARCHAR" />
107
     <result column="file_route" property="fileRoute" jdbcType="VARCHAR" />
108
+    <result column="zhycsj" property="zhycsj" jdbcType="TIMESTAMP" />
108
 
109
 
109
   </resultMap>
110
   </resultMap>
110
   <sql id="Example_Where_Clause" >
111
   <sql id="Example_Where_Clause" >
@@ -182,7 +183,7 @@
182
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
183
     smoke_point, reeze_test, residual_solvent, lead, total_arsenic, aflatoxin, quailtycard_id, 
183
     butyl_phenol, flag_type,
184
     butyl_phenol, flag_type,
184
     jylb,qfrq,ypsl,dbsl,ypdj,
185
     jylb,qfrq,ypsl,dbsl,ypdj,
185
-    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route
186
+    qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx, file_route, zhycsj
186
   </sql>
187
   </sql>
187
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
188
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" >
188
     select
189
     select
@@ -247,7 +248,7 @@
247
       lead, total_arsenic, aflatoxin,
248
       lead, total_arsenic, aflatoxin,
248
       jylb,qfrq,ypsl,dbsl,ypdj,
249
       jylb,qfrq,ypsl,dbsl,ypdj,
249
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
250
       qyqy,qydbh,zblb,jdrxm,ypbh,sfzcccnx,
250
-      quailtycard_id, butyl_phenol, flag_type, file_route)
251
+      quailtycard_id, butyl_phenol, flag_type, file_route, zhycsj)
251
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
252
     values (SEQ_STORAGE_QUALITYCHECK.nextVal, #{depotId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER},
252
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
253
       #{warehouseId,jdbcType=INTEGER}, #{typeUpdate,jdbcType=VARCHAR}, #{subType,jdbcType=INTEGER},
253
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
254
       #{subTypeDetailed,jdbcType=INTEGER}, #{checkTime,jdbcType=TIMESTAMP}, #{checkResult,jdbcType=VARCHAR}, 
@@ -280,7 +281,7 @@
280
       #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR},
281
       #{lead,jdbcType=VARCHAR}, #{totalArsenic,jdbcType=VARCHAR}, #{aflatoxin,jdbcType=VARCHAR},
281
       #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
282
       #{jylb,jdbcType=VARCHAR}, #{qfrq,jdbcType=TIMESTAMP},#{ypsl,jdbcType=VARCHAR},#{dbsl,jdbcType=VARCHAR},#{ypdj,jdbcType=VARCHAR},
282
       #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
283
       #{qyqy,jdbcType=VARCHAR}, #{qydbh,jdbcType=VARCHAR},#{zblb,jdbcType=VARCHAR},#{jdrxm,jdbcType=VARCHAR},#{ypbh,jdbcType=VARCHAR},#{sfzcccnx,jdbcType=VARCHAR},
283
-      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR})
284
+      #{quailtycardId,jdbcType=VARCHAR}, #{butylPhenol,jdbcType=VARCHAR}, #{flagType,jdbcType=INTEGER}, #{fileRoute,jdbcType=VARCHAR}, #{zhycsj,jdbcType=TIMESTAMP})
284
   </insert>
285
   </insert>
285
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
286
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" >
286
     insert into storage_qualitycheck
287
     insert into storage_qualitycheck
@@ -590,6 +591,9 @@
590
       <if test="fileRoute != null" >
591
       <if test="fileRoute != null" >
591
         fileRoute,
592
         fileRoute,
592
       </if>
593
       </if>
594
+      <if test="zhycsj != null">
595
+        zhycsj,
596
+      </if>
593
     </trim>
597
     </trim>
594
     <trim prefix="values (" suffix=")" suffixOverrides="," >
598
     <trim prefix="values (" suffix=")" suffixOverrides="," >
595
       SEQ_STORAGE_QUALITYCHECK.nextVal,
599
       SEQ_STORAGE_QUALITYCHECK.nextVal,
@@ -893,6 +897,9 @@
893
       <if test="fileRoute != null" >
897
       <if test="fileRoute != null" >
894
         #{fileRoute,jdbcType=VARCHAR},
898
         #{fileRoute,jdbcType=VARCHAR},
895
       </if>
899
       </if>
900
+      <if test="zhycsj != null">
901
+        #{zhycsj,jdbcType=TIMESTAMP},
902
+      </if>
896
     </trim>
903
     </trim>
897
   </insert>
904
   </insert>
898
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
905
   <select id="countByExample" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheckExample" resultType="java.lang.Integer" >
@@ -1207,6 +1214,9 @@
1207
       <if test="record.fileRoute != null" >
1214
       <if test="record.fileRoute != null" >
1208
         file_route = #{record.fileRoute,jdbcType=VARCHAR},
1215
         file_route = #{record.fileRoute,jdbcType=VARCHAR},
1209
       </if>
1216
       </if>
1217
+      <if test="record.zhycsj != null">
1218
+        zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP},
1219
+      </if>
1210
     </set>
1220
     </set>
1211
     <if test="_parameter != null" >
1221
     <if test="_parameter != null" >
1212
       <include refid="Update_By_Example_Where_Clause" />
1222
       <include refid="Update_By_Example_Where_Clause" />
@@ -1314,7 +1324,8 @@
1314
     jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
1324
     jdrxm= #{record.jdrxm,jdbcType=VARCHAR},
1315
     ypbh= #{record.ypbh,jdbcType=VARCHAR},
1325
     ypbh= #{record.ypbh,jdbcType=VARCHAR},
1316
     sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1326
     sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1317
-      file_route = #{record.fileRoute,jdbcType=VARCHAR}
1327
+      file_route = #{record.fileRoute,jdbcType=VARCHAR},
1328
+      zhycsj = #{record.zhycsj,jdbcType=TIMESTAMP}
1318
     <if test="_parameter != null" >
1329
     <if test="_parameter != null" >
1319
       <include refid="Update_By_Example_Where_Clause" />
1330
       <include refid="Update_By_Example_Where_Clause" />
1320
     </if>
1331
     </if>
@@ -1622,6 +1633,9 @@
1622
       <if test="fileRoute != null" >
1633
       <if test="fileRoute != null" >
1623
         file_route = #{fileRoute,jdbcType=VARCHAR},
1634
         file_route = #{fileRoute,jdbcType=VARCHAR},
1624
       </if>
1635
       </if>
1636
+      <if test="zhycsj != null">
1637
+        zhycsj = #{zhycsj,jdbcType=TIMESTAMP},
1638
+      </if>
1625
     </set>
1639
     </set>
1626
     where id = #{id,jdbcType=INTEGER}
1640
     where id = #{id,jdbcType=INTEGER}
1627
   </update>
1641
   </update>
@@ -1726,7 +1740,8 @@
1726
       ypbh= #{record.ypbh,jdbcType=VARCHAR},
1740
       ypbh= #{record.ypbh,jdbcType=VARCHAR},
1727
       sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1741
       sfzcccnx= #{record.sfzcccnx,jdbcType=VARCHAR},
1728
       ypdj= #{record.ypdj,jdbcType=VARCHAR},
1742
       ypdj= #{record.ypdj,jdbcType=VARCHAR},
1729
-        file_route = #{fileRoute,jdbcType=VARCHAR}
1743
+      file_route = #{fileRoute,jdbcType=VARCHAR},
1744
+      zhycsj = #{zhycsj,jdbcType=TIMESTAMP}
1730
     where id = #{id,jdbcType=INTEGER}
1745
     where id = #{id,jdbcType=INTEGER}
1731
   </update>
1746
   </update>
1732
 
1747
 
@@ -1826,7 +1841,7 @@
1826
     sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
1841
     sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
1827
     sqk.butyl_phenol, sqk.flag_type,
1842
     sqk.butyl_phenol, sqk.flag_type,
1828
     sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
1843
     sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
1829
-     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route
1844
+     sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj
1830
   </sql>
1845
   </sql>
1831
 
1846
 
1832
   <select id="queryPrimaryKey" resultMap="BaseResultMap">
1847
   <select id="queryPrimaryKey" resultMap="BaseResultMap">

+ 20 - 0
src/main/java/com/chinaitop/depot/storage/model/StorageQualitycheck.java

@@ -54,6 +54,9 @@ public class StorageQualitycheck {
54
 
54
 
55
     private Integer levelUpdate;//等级
55
     private Integer levelUpdate;//等级
56
 
56
 
57
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
58
+    private Date zhycsj;
59
+
57
     public String getTypeUpdate() {
60
     public String getTypeUpdate() {
58
         return typeUpdate;
61
         return typeUpdate;
59
     }
62
     }
@@ -124,6 +127,7 @@ public class StorageQualitycheck {
124
 
127
 
125
     private String acceptUnite;//检验单位
128
     private String acceptUnite;//检验单位
126
 
129
 
130
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
127
     private Date inputTime;
131
     private Date inputTime;
128
 
132
 
129
     private String numberUpdate;//number_update
133
     private String numberUpdate;//number_update
@@ -2035,4 +2039,20 @@ public class StorageQualitycheck {
2035
     public void setFileRoute(String fileRoute) {
2039
     public void setFileRoute(String fileRoute) {
2036
         this.fileRoute = fileRoute;
2040
         this.fileRoute = fileRoute;
2037
     }
2041
     }
2042
+    
2043
+    /**
2044
+	 * 最后一车时间(入库时间)
2045
+	 * @return
2046
+	 */
2047
+	public Date getZhycsj() {
2048
+		return zhycsj;
2049
+	}
2050
+
2051
+	/**
2052
+	 * 最后一车时间(入库时间)
2053
+	 * @param zhycsj
2054
+	 */
2055
+	public void setZhycsj(Date zhycsj) {
2056
+		this.zhycsj = zhycsj;
2057
+	}
2038
 }
2058
 }