云南近期bug修改

src/main/java/com/chinaitop/depot/supervise/mapper/DepotStyleMapper.xml

@@ -537,52 +537,27 @@
   </select>
   <select id="selectRK" parameterType="java.util.Map" resultType="java.util.HashMap">
     SELECT
-        detail.house_id,
-        notice.id,
-        notice.process_instance_id,
-        notice.bill_type,
-        style.styles,
-        style.imgdata,
-        storehouse.storehouse_name
+        store.storehouse_id house_id,
+        styleS.styles,
+        styleS.imgdata,
+        store.storehouse_name
     FROM
-        business_delivery_storage_notice notice
-    LEFT JOIN business_store_ware_detail detail ON detail.zid = notice.id
-    AND type = 'notice'
-    JOIN (
-        SELECT
-            notice2.agree_time,
-            detail2.house_id
-        FROM
-            business_delivery_storage_notice notice2
-        LEFT JOIN business_store_ware_detail detail2 ON detail2.zid = notice2.id
-        AND type = 'notice'
-    ) no2 ON no2.agree_time = notice.agree_time
-    AND no2.house_id = detail.house_id
-    LEFT JOIN depot_style style ON style.indexid = detail.house_id
-    LEFT JOIN basic_storehouse storehouse ON storehouse.storehouse_id = detail.house_id
-    WHERE notice.in_application = '1'
-      AND notice.bill_type = #{billType}
-      AND style.type = #{type}
-    GROUP BY style.styles
+        basic_storehouse store
+    LEFT JOIN basic_warehouse ware ON ware.storehouse_id = store.storehouse_id
+    LEFT JOIN depot_style styleS ON styleS.indexid = store.storehouse_id
+    WHERE ware.crk_status = '2' AND styleS.type = #{type}
   </select>
     <select id="selectCK" parameterType="java.util.Map" resultType="java.util.HashMap">
         SELECT
-        detail.house_id,
-        notice.id,
-        notice.process_instance_id,
-        notice.bill_type,
-        style.styles,
-        style.imgdata,
-        storehouse.storehouse_name
-        FROM
-        business_delivery_storage_notice notice
-        LEFT JOIN business_store_ware_detail detail ON detail.zid = notice.id and type='notice'
-        LEFT JOIN depot_style style ON style.indexid = detail.house_id
-        LEFT JOIN basic_storehouse storehouse ON storehouse.storehouse_id = detail.house_id
-        WHERE notice.in_application = '1'
-        AND notice.bill_type = #{billType}
-        AND style.type = #{type}
-        GROUP BY style.styles
+        store.storehouse_id house_id,
+        styleS.styles,
+        styleS.imgdata,
+        store.storehouse_name
+    FROM
+        basic_storehouse store
+    LEFT JOIN basic_warehouse ware ON ware.storehouse_id = store.storehouse_id
+    LEFT JOIN depot_style styleS ON styleS.indexid = store.storehouse_id
+    WHERE ware.crk_status = '4' AND styleS.type = #{type}
     </select>
     <select id="selectHouseState" parameterType="java.util.Map" resultType="java.util.HashMap">
         SELECT