质检bug

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

@@ -26,10 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by product on 2017/10/11.
@@ -58,16 +55,29 @@ public class StorageQualitycheckController {
             @ApiImplicitParam(name = "qualitycheck", value = "实体类", paramType = "query"),
             @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
             @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "quality", value = "储粮性质", paramType = "query"),
+            @ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "checkTime", value = "检查日期", paramType = "query"),
             @ApiImplicitParam(name = "flagType", value = "判断是否已验收", paramType = "query"),
             @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
     })
     public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
-                                                  StorageQualitycheck qualitycheck, String checktype,String checkResult,Integer flagType, Integer orgId) {
+                                                  StorageQualitycheck qualitycheck, String checktype, String checkResult, Integer flagType,
+                                                  String quality, Integer subType, Date checkTime, Integer orgId) {
     	StorageQualitycheck qualityCheck = new StorageQualitycheck();
         //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
         if (StringUtils.isNotBlank(checktype)){
             qualityCheck.setType(checktype);
         }
+        if (StringUtils.isNotBlank(quality)){
+            qualityCheck.setQuality(quality);
+        }
+        if (subType!= null){
+            qualityCheck.setSubType(subType);
+        }
+        if (checkTime!= null){
+            qualityCheck.setCheckTime(checkTime);
+        }
         // 仓房id.
         if (qualitycheck.getHouseId() != null) {
             qualityCheck.setHouseId(qualitycheck.getHouseId());
@@ -108,7 +118,7 @@ public class StorageQualitycheckController {
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }
-        List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitycheck(qualityCheck);
+        List<StorageQualitycheck> list = storageQualitycheckService.queryByQualitychecklist(qualityCheck);
 
         PageInfo<StorageQualitycheck> pageInfo = new PageInfo<StorageQualitycheck>(list);
         if(pageInfo.getList()!=null){

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

@@ -1001,12 +1001,14 @@
 </sql>
 
 <select id="queryByExample" parameterType="com.chinaitop.depot.storage.model.StorageFoodbasicinfoExample" resultMap="BaseResultMap">
-    select
+    select DISTINCT
+    sq.seal_date sealDate,
     <include refid="ExtBase_Column_List" />,
     bs.storeHouse_name storehouseName,bw.warehouse_name wareHouseName
     FROM storage_foodbasicinfo sfo
     LEFT JOIN basic_storehouse bs on bs.storehouse_id = sfo.house_id
     LEFT JOIN basic_warehouse bw on bw.warehouse_id = sfo.warehouse_id
+    LEFT JOIN storage_qualitycheck sq on sq.warehouse_id = sfo.warehouse_id
    <where>
       <if test="houseId != null">
         and sfo.house_id = #{houseId}
@@ -1020,6 +1022,7 @@
      <if test="historyStatus != null">
        and sfo.history_status = #{historyStatus}
      </if>
+     and sq.seal_date > 0
    </where>
   order by sfo.id desc
 </select>

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

@@ -114,6 +114,7 @@ public interface StorageQualitycheckMapper {
     List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(StorageQualitycheck qualitycheck);
     StorageQualitycheck queryPrimaryKey(Integer id);
     List<StorageQualitycheck> queryByExample(StorageQualitycheck example);
+    List<StorageQualitycheck> queryByExamplelist(StorageQualitycheck example);
     List<Map<String,Object>> getStoreQualityList(Integer orgId);
 
     

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

@@ -1933,6 +1933,58 @@
     order by sqk.id desc
   </select>
 
+  <select id="queryByExamplelist" parameterType="com.chinaitop.depot.storage.model.StorageQualitycheck" resultMap="BaseResultMap">
+    select
+    <include refid="ExtBase_Column_List" />,
+    bs.storeHouse_name storehouseName,
+    bw.warehouse_name wareHouseName
+    FROM storage_qualitycheck sqk
+    LEFT JOIN basic_storehouse bs on bs.storehouse_id = sqk.house_id
+    LEFT JOIN basic_warehouse bw  on bw.warehouse_id = sqk.warehouse_id
+    <where>
+      <if test="houseId !=null">
+        and sqk.house_id = #{houseId}
+      </if>
+      <if test="orgId !=null">
+        and sqk.org_id = #{orgId}
+      </if>
+      <if test="warehouseId !=null">
+        and sqk.warehouse_id = #{warehouseId}
+      </if>
+      <if test="type !=null">
+        and sqk.type = #{type}
+      </if>
+      <if test="subTypeDetailed !=null">
+        and sqk.sub_type_detailed = #{subTypeDetailed}
+      </if>
+      <if test="level !=null">
+        and sqk.level = #{level}
+      </if>
+      <if test="historyStatus !=null">
+        and sqk.history_status = #{historyStatus}
+      </if>
+      <if test="sealStatus !=null">
+        and sqk.seal_status = #{sealStatus}
+      </if>
+      <if test="flagType !=null">
+        and sqk.flag_type is null
+      </if>
+      <if test="checkResult !=null">
+        and sqk.check_result = #{checkResult}
+      </if>
+      <if test="quality !=null">
+        and sqk.quality = #{quality}
+      </if>
+      <if test="subType !=null">
+        and sqk.sub_type = #{subType}
+      </if>
+      <if test="checkTime !=null">
+        and sqk.check_time = #{checkTime}
+      </if>
+    </where>
+    order by sqk.id desc
+  </select>
+
   <select id="getStoreQualityList"  resultType="java.util.Map" parameterType="java.lang.Integer">
     select
     <include refid="Base_Column_List" />

src/main/java/com/chinaitop/depot/storage/service/StorageQualitycheckService.java

@@ -120,4 +120,5 @@ public interface StorageQualitycheckService {
 	 */
     List<Map<String, Object>> getAllFoodStocks(Map<String, Object> paramMap);
 
+	List<StorageQualitycheck> queryByQualitychecklist(StorageQualitycheck example);
 }

src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -35,6 +35,12 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 		return qualitycheckMapper.queryByExample(example);
 	}
 
+	@Override
+	public List<StorageQualitycheck> queryByQualitychecklist(StorageQualitycheck example) {
+		//对list进行处理获取仓房名称和货位名称
+		return qualitycheckMapper.queryByExamplelist(example);
+	}
+
 	// 保存数据
 	@Override
 	public Integer save(StorageQualitycheck qualitycheck) {