生物安全车辆修改2

huimv-admin/src/main/java/com/huimv/admin/mapper/BillCleanMapper.java

@@ -22,7 +22,7 @@ public interface BillCleanMapper extends BaseMapper<BillClean> {
 
     Page<CleanAndDryVo> listPersonalCleanAndDry(Page<CleanAndDryVo> page, Integer userId);
 
-    Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String status);
+    Page<CleanAndDryVo2> CleanAndDry(Page<CleanAndDryVo2> page, String farmId,String type,String[] status);
 
-    Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String status);
+    Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String[] status);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java

@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Map;
 
@@ -95,13 +96,18 @@ public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean
             Page<CleanAndDryVo2> cleanAndDryVo2Page = null;
             Page<CleanAndDryVo2> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
             if ("0".equals(data)) {
-             cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1");
+             cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","));
             }
+            ArrayList<String> arrayList = new ArrayList<>();
             if ("1".equals(data)) {
-               cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, "0");
+                arrayList.add("0");
+                String[] s = arrayList.toArray(new String[arrayList.size()]);
+               cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, s);
             }
             if ("2".equals(data)) {
-             cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, "1");
+                arrayList.add("1");
+                String[] s = arrayList.toArray(new String[arrayList.size()]);
+             cleanAndDryVo2Page =  cleanMapper.CleanAndDry(page, farmId, type, s);
             }
             return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }

huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -752,18 +752,24 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         QueryWrapper<BillClean> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId).ne("vistit_type", 0).orderByDesc("sub_date");
         if ("0".equals(type)) {
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "(0,1,2)");
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "0,1,2".split(","));
         }
+        ArrayList<String> arrayList = new ArrayList<>();
         if ("1".equals(type)) {
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "0");
+            arrayList.add("0");
+            String[] s = arrayList.toArray(new String[arrayList.size()]);
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, s);
         }
         if ("2".equals(type)) {
-            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, "1");
+            arrayList.add("1");
+            String[] s = arrayList.toArray(new String[arrayList.size()]);
+            cleanAndDryVo2Page =  cleanMapper.CleanAndDry2(page, farmId, s);
         }
         if ("3".equals(type)) {
-            cleanAndDryVo2Page =   cleanMapper.CleanAndDry2(page, farmId, "2");
+            arrayList.add("2");
+            String[] s = arrayList.toArray(new String[arrayList.size()]);
+            cleanAndDryVo2Page =   cleanMapper.CleanAndDry2(page, farmId, s);
         }
-
         return new Result(ResultCode.SUCCESS,cleanAndDryVo2Page);
 
     }

huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml

@@ -52,20 +52,32 @@
 
     <select id="CleanAndDry" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
         select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type}
-        and img_status in (#{status})
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
         union all
         select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type}
-        and img_status in (#{status})
+        and img_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
     </select>
 
 
     <select id="CleanAndDry2" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
-        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,1 AS 'type' from bill_clean where farm_id=#{farmId} and
         vistit_type in (1,2,3,4,5,6)
-        and bill_status in (#{status})
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
         union all
-        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and
+        select id,vistit_type,dest_name,dest_id,admission_user_name,admission_user_id,vistit_date,sub_date,farm_id,bill_status,pass_date,pass_user_name,pass_user_id,process_id,check_date,test_location,test_location_id,phone,car_num,img_url,img_status,2 AS 'type' from bill_dry where farm_id=#{farmId} and
         vistit_type in (1,2,3,4,5,6)
-        and bill_status in (#{status})
+        and bill_status in
+        <foreach collection="status" item="statu" separator="," open="(" close=")">
+            #{statu}
+        </foreach>
     </select>
 </mapper>