场长

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

@@ -49,13 +49,18 @@ ORDER BY sub_date DESC
 
 
     <select id="listCarAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
-        SELECT id,car_num, bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
+SELECT id,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type} AND img_status = 1
+
+UNION ALL
+
+SELECT id,car_num, bill_status, isolate_location, isolate_start_date AS check_date, isolate_start_date AS 'startTime', isolate_end_date AS 'endTime', NULL AS test_location, NULL AS vistit_type, NULL AS dest_name, NULL AS vistit_date,3 AS 'type',sub_date
 FROM bill_isolate WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
 SELECT id,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
-FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type}
+FROM bill_clean WHERE farm_id = #{farmId} AND vistit_type = #{type} AND img_status = 1
 
 UNION ALL