场长

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

@@ -294,7 +294,9 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             return new Result(ResultCode.SUCCESS, billPcrMapper.selectById(id));
         } else if (type.equals("2")) {
             return new Result(ResultCode.SUCCESS, billCleanMapper.selectById(id));
-        } else {
+        } else if (type.equals("4")){
+            return new Result(ResultCode.SUCCESS, dryMapper.selectById(id));
+        }else {
             return new Result(ResultCode.SUCCESS, billIsolateMapper.selectById(id));
         }
     }

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

@@ -49,13 +49,13 @@ ORDER BY sub_date DESC
 
 
     <select id="listCarAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
-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
+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, 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}
+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