.

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

@@ -68,7 +68,7 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "qualitycheck", value = "实体类", paramType = "query"),
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
             @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
-            @ApiImplicitParam(name = "depotType", value = "判断是否是代储", paramType = "query"),
+            @ApiImplicitParam(name = "depotType", value = "判断是否是代储", paramType = "query")
     })
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize, StorageQualitycheck qualitycheck,
                                                   String checktype,String checkResult,String depotType,String createTime,
@@ -121,8 +121,18 @@ public class StorageQualitycheckController {
         }
 
         if(processState != null){
-        	qualityCheck.setProcessState(processState);
+        	List<Integer> processList = new ArrayList<Integer>();
+        	if (processState == 1) {
+        		processList.add(processState);
+        		qualityCheck.setProcessStateList(processList);
+        	} else {
+        		processList.add(2);
+        		processList.add(3);
+        	}
+        	qualityCheck.setProcessStateList(processList);
+        	//qualityCheck.setProcessState(processState);
         }
+
         //归档用时间查询
         if(ParameterUtil.isnotnull(createTime)){
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -1919,8 +1919,14 @@
       <if test="sealDate != null" >
         and sq.check_time &lt;= #{sealDate}
       </if>
-      <if test="processState !=null">
+      <!-- <if test="processState !=null">
          and sq.process_state = #{processState}
+      </if> -->
+      <if test="processStateList != null and processStateList.size() > 0">
+        and sq.process_state in
+        <foreach close=")" collection="processStateList" item="processStateList" open="(" separator=",">
+          #{processStateList}
+        </foreach>
       </if>
       <!--区分粮情卡的数据-->
       and sq.flag_type is null

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

@@ -283,6 +283,8 @@ public class StorageQualitycheck {
     private String fileRoute;
 
     List<Integer> typeList = new ArrayList<Integer>();
+    
+    List<Integer> processStateList = new ArrayList<Integer>();
 
     public String getQyqy() {
         return qyqy;
@@ -2022,7 +2024,15 @@ public class StorageQualitycheck {
         this.typeList = typeList;
     }
 
-    public String getChooserOrgan() {
+    public List<Integer> getProcessStateList() {
+		return processStateList;
+	}
+
+	public void setProcessStateList(List<Integer> processStateList) {
+		this.processStateList = processStateList;
+	}
+
+	public String getChooserOrgan() {
         return chooserOrgan;
     }