熏蒸小优化

src/main/java/com/chinaitop/depot/agent/archive/mapper/StorageArchiveMapper.xml

@@ -308,21 +308,40 @@
     LEFT JOIN role_info b ON b.role_id = a.post_type
     LEFT JOIN basic_keeper_house h ON h.keeper_Id = a.id
     LEFT JOIN basic_storehouse store ON store.storehouse_id = h.house_Id AND store.del_flag = 1
-    LEFT JOIN basic_warehouse ware ON ware.storehouse_id = store.storehouse_id AND ware.del_flag = 1
-    AND store.del_flag = 1
+    LEFT JOIN (
+      SELECT
+      *
+      FROM
+      (
+        SELECT
+          ROW_NUMBER () OVER (PARTITION BY storehouse_id ORDER BY crk_status desc) rn,
+          warehouse_id,
+          storehouse_id,
+          crk_status,
+          del_flag
+        FROM
+            basic_warehouse
+        WHERE
+        <if test="orgId != null" >
+          org_id = #{orgId,jdbcType=VARCHAR}
+        </if>
+      ) a
+      WHERE
+      rn = 1
+    ) ware ON ware.storehouse_id = store.storehouse_id AND ware.del_flag = 1
     WHERE
     (
-    SELECT
-    count(1)
-    FROM
-    business_agent_storehouse astore
-    LEFT JOIN business_agent_depot depot ON astore.agent_depot_id = depot.id
-    WHERE
-    astore.storehouse_id = h.house_Id
-    AND astore.del_flag = 1 AND depot.del_flag = 1
-    <if test="orgId != null" >
-      AND depot.depot_id = #{orgId,jdbcType=VARCHAR}
-    </if>
+      SELECT
+      count(1)
+      FROM
+      business_agent_storehouse astore
+      LEFT JOIN business_agent_depot depot ON astore.agent_depot_id = depot.id
+      WHERE
+      astore.storehouse_id = h.house_Id
+      AND astore.del_flag = 1 AND depot.del_flag = 1
+      <if test="orgId != null" >
+        AND depot.depot_id = #{orgId,jdbcType=VARCHAR}
+      </if>
     ) = 0
     AND a.user_Id = #{userId,jdbcType=VARCHAR}
     AND ware.crk_status = 1
@@ -335,47 +354,11 @@
   </select>
 
   <select id="getCCBJLhouse" resultType="java.util.Map" parameterType="java.util.Map">
-<!--    SELECT-->
-<!--    k. NAME,-->
-<!--    store.storehouse_name houseName,-->
-<!--    store.storehouse_id houseId,-->
-<!--    store.storehouse_code houseCode,-->
-<!--    b.role_name roleName-->
-<!--    FROM-->
-<!--    basic_storehouse store-->
-<!--    LEFT JOIN basic_keeper k ON k.house_id = store.storehouse_id-->
-<!--    LEFT JOIN role_info b ON b.role_id = k.post_type-->
-<!--    LEFT JOIN basic_warehouse ware ON ware.storehouse_id = store.storehouse_id-->
-<!--    WHERE (-->
-<!--    SELECT-->
-<!--    count(1)-->
-<!--    FROM-->
-<!--    business_agent_storehouse astore-->
-<!--    LEFT JOIN business_agent_depot depot ON astore.agent_depot_id = depot.id-->
-<!--    WHERE-->
-<!--    astore.storehouse_id = store.storehouse_id-->
-<!--    AND astore.del_flag = 1-->
-<!--    AND depot.del_flag = 1-->
-<!--    AND depot.depot_id = #{orgId,jdbcType=VARCHAR}-->
-<!--    ) = 0-->
-<!--    AND store.del_flag = 1-->
-<!--    AND ware.crk_status = 1-->
-<!--    AND ware.del_flag = 1-->
-<!--    <if test="orgId != null" >-->
-<!--      AND store.org_id = #{orgId,jdbcType=VARCHAR}-->
-<!--    </if>-->
-<!--    UNION ALL-->
     SELECT
     k. NAME,
-    concat(
-    cast(bstore.depot_name AS CHAR),
-    '_',
-    cast(
-    bstore.storehouse_name AS CHAR
-    )
-    ) houseName,
+    bstore.depot_name||'_'||bstore.storehouse_name AS houseName,
     store.storehouse_id houseId,
-    store.storehouse_code houseCode,
+    bstore.storehouse_code houseCode,
     b.role_name roleName
     FROM
     business_agent_storehouse store