个人查询

huimv-admin/src/main/java/com/huimv/admin/entity/vo/FactoryDirectorVo.java

@@ -20,8 +20,6 @@ public class FactoryDirectorVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
     private LocalDateTime checkDate;
 
-    private String admissionUserName;
-
     private String testLocation;
     private Integer vistitType;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")

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

@@ -49,27 +49,27 @@ ORDER BY sub_date DESC
 
 
     <select id="listCarAll" resultType="com.huimv.admin.entity.vo.FactoryDirectorVo">
-SELECT id,admission_user_name,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,admission_user_name AS 'userName',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,admission_user_name,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName',car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,4 AS 'type',sub_date
 FROM bill_dry WHERE farm_id = #{farmId} AND vistit_type = #{type} AND img_status = 1
 
 UNION ALL
 
-SELECT id,admission_user_name,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,2 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName',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} AND img_status = 1
 
 UNION ALL
 
-SELECT id,admission_user_name,car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName',car_num, bill_status, test_location, check_date, NULL, NULL, NULL, vistit_type, NULL, NULL,1 AS 'type',sub_date
 FROM bill_pcr WHERE farm_id = #{farmId} AND vistit_type = #{type}
 
 UNION ALL
 
-SELECT id,admission_user_name,car_num, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
+SELECT id,admission_user_name AS 'userName',car_num, bill_status, NULL, NULL, NULL, NULL, NULL, vistit_type, dest_name, vistit_date,0 AS 'type',sub_date
 FROM bill_personnel_admission WHERE farm_id = #{farmId} AND vistit_type = #{type}
 ORDER BY sub_date DESC
     </select>