首页当前作业修改

src/main/java/com/chinaitop/depot/supervise/controller/depotStyleController.java

@@ -76,8 +76,7 @@ public class depotStyleController {
 //            list = Service.selectWorkingForHouse(map);
             //list = Service.selectCLTask(map);
         }else if(ParameterUtil.isequal(type,"3.2")){//作业-里面的熏蒸，这个也没用了，现在熏蒸没有状态了
-//            list = Service.selectWorkingForHouse(map);
-            //list = Service.selectCLXZ(map);
+            list = Service.selectCLXZ(map);
         }else if(ParameterUtil.isequal(type,"3.3")){//入库
             map.put("billType",1);
             list = Service.selectRK(map);

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

@@ -528,42 +528,25 @@
     AND task.task_end_time IS null
   </select>
   <select id="selectCLXZ" parameterType="java.util.Map" resultType="java.util.HashMap">
-    SELECT
-        fum.id,
-        fum.house_id,
-        styleS.styles,
-        styleS.imgdata,
-        storehouse.storehouse_name
-    FROM
-        t_fumigation_plan fum
-    LEFT JOIN depot_style styleS ON styleS.indexid = fum.house_id
-    LEFT JOIN basic_storehouse storehouse ON storehouse.storehouse_id = fum.house_id
-    WHERE styleS.type = #{type}
-    AND fum.state = '5'
+    select
+      b.storehouse_name storehouse_name
+    from t_fumigation_forrecord a 
+    left join basic_storehouse b on b.storehouse_id=a.house_id
+    where nvl(a.state,'')!='' and a.state!='10' and a.org_id=#{orgId}
   </select>
   <select id="selectRK" parameterType="java.util.Map" resultType="java.util.HashMap">
-    SELECT
-        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 = '2' AND styleS.type = #{type} and store.org_id=#{orgId}
+    select 
+      b.storehouse_name||a.warehouse_name storehouse_name
+    from basic_warehouse a 
+    left join basic_storehouse b on a.storehouse_id=a.storehouse_id
+    where a.crk_status='2' and a.org_id=#{orgId}
   </select>
     <select id="selectCK" parameterType="java.util.Map" resultType="java.util.HashMap">
-        SELECT
-        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} and store.org_id=#{orgId}
+        SELECT 
+          store.storehouse_name||ware.warehouse_name storehouse_name
+        FROM basic_warehouse ware
+        LEFT JOIN basic_storehouse store ON ware.storehouse_id = store.storehouse_id
+        WHERE ware.crk_status = '4' and store.org_id=#{orgId}
     </select>
     <select id="selectHouseState" parameterType="java.util.Map" resultType="java.util.HashMap">
         select * from (