春秋普查

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

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

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

@@ -1559,25 +1559,22 @@
     <if test="warehouseId !=null">
       and warehouse_id = #{warehouseId}
     </if>
-
-
   </select>
 
-  <select id="getQualitycheckListByFoodbasicinfoCheck" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="getQualitycheckListByFoodbasicinfoCheck" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List" />
-      FROM
-      storage_qualitycheck sqk
-    WHERE
-    sqk.id in (
-      SELECT
-      fcs.qualitycheck_id
-      FROM
-      storage_foodbasicinfochecks fcs
-      WHERE
-      fcs.foodbasicinfo_id =#{id}
-    )
-
+    FROM storage_qualitycheck
+    WHERE type = '2'
+    <if test="houseId !=null">
+      and house_id = #{houseId}
+    </if>
+    <if test="tankId !=null">
+      and tank_id = #{tankId}
+    </if>
+    <if test="warehouseId !=null">
+      and warehouse_id = #{warehouseId}
+    </if>
   </select>
 
   <sql id="ExtBase_Column_List">

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

@@ -83,7 +83,8 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
 
 	@Override
 	public List<StorageQualitycheck> getQualitycheckListByFoodbasicinfoCheck(StorageQualitycheck qualitycheck,Integer foodbasicinfoId) {
-        List<StorageQualitycheck> list = qualitycheckMapper.getThirdCheckList(qualitycheck);
+	    //获取春秋普查
+        List<StorageQualitycheck> list = qualitycheckMapper.getQualitycheckListByFoodbasicinfoCheck(qualitycheck);
         if(list.size()>0){
             int i = 0;
             for(;i<list.size();i++){