生物安全车辆修改4

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,String location);
 
     Page<CleanAndDryVo2> CleanAndDry2(Page<CleanAndDryVo2> page, String farmId,String[] status);
 }

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

@@ -96,18 +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".split(","));
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, "0,1".split(","),TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             ArrayList<String> arrayList = new ArrayList<>();
             if ("1".equals(data)) {
                 arrayList.add("0");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s);
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s,TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             if ("2".equals(data)) {
                 arrayList.add("1");
                 String[] s = arrayList.toArray(new String[arrayList.size()]);
-                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s);
+                cleanAndDryVo2Page = cleanMapper.CleanAndDry(page, farmId, type, s,TokenSign.getWorkIdByJwtToken(httpServletRequest));
             }
             return new Result(ResultCode.SUCCESS, cleanAndDryVo2Page);
         }

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

@@ -51,30 +51,31 @@
     </select>
 
     <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}
+        select *,1 AS 'type' from bill_clean where farm_id=#{farmId} and vistit_type=#{type} and test_location_id=#{location}
         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}
+        select *,2 AS 'type' from bill_dry where farm_id=#{farmId} and vistit_type=#{type} and test_location_id=#{location}
         and img_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
+        ORDER BY sub_date DESC
     </select>
 
 
     <select id="CleanAndDry2" resultType="com.huimv.admin.entity.vo.CleanAndDryVo2">
         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)
+        vistit_type in (1,2,3,4,5,6) and img_status=1
         and bill_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}
         </foreach>
         union all
         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)
+        vistit_type in (1,2,3,4,5,6) and img_status=1
         and bill_status in
         <foreach collection="status" item="statu" separator="," open="(" close=")">
             #{statu}