验收

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

@@ -54,10 +54,11 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
             @ApiImplicitParam(name = "qualitycheck", value = "实体类", paramType = "query"),
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
-            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query")
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "flagType", value = "判断是否已验收", paramType = "query")
     })
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
-                                                  StorageQualitycheck qualitycheck, String checktype,String checkResult) {
+                                                  StorageQualitycheck qualitycheck, String checktype,String checkResult,Integer flagType) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
         if (StringUtils.isNotBlank(checktype)){
@@ -88,10 +89,15 @@ public class StorageQualitycheckController {
         }
 
         //检验结果（0：合格 , 1 :不合格）
-
         if (StringUtils.isNotBlank(checkResult)) {
             qualityCheck.setCheckResult(checkResult);
         }
+
+        //验收结果
+        if (qualitycheck.getFlagType() != null) {
+            qualityCheck.setFlagType(flagType);
+        }
+
         qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
         //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
         //qualityCheck.setSealStatus("0");

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

@@ -1830,13 +1830,13 @@
       <if test="sealStatus !=null">
         and sqk.seal_status = #{sealStatus}
       </if>
-      <if test="sealStatus !=null">
-        and sqk.seal_status = #{sealStatus}
+      <if test="flagType !=null">
+        and sqk.flag_type is null
       </if>
       <if test="checkResult !=null">
         and sqk.check_result = #{checkResult}
       </if>
-    </where>
+    </where>r
     GROUP BY sqk.id
     order by sqk.id desc
   </select>