|
|
@@ -507,7 +507,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
left join sys_user su on su.user_id=lsar.join_user_id
|
|
|
where lsar.subject_id=#{subjectId} and lsar.access_status=1
|
|
|
and init_flag=0-->
|
|
|
-
|
|
|
SELECT
|
|
|
DATE_FORMAT(lsar.in_time,'%Y-%m-%d %H:%i:%s') AS signTime,
|
|
|
su.user_name AS jobNumber,
|
|
|
@@ -515,12 +514,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
su.avatar AS avatar
|
|
|
FROM lab_subject_access_record lsar
|
|
|
LEFT JOIN sys_user su ON su.user_id=lsar.join_user_id
|
|
|
- WHERE lsar.subject_id=209 AND lsar.access_status=1 AND init_flag=0
|
|
|
+ WHERE lsar.subject_id=#{subjectId} AND lsar.access_status=1 AND init_flag=0
|
|
|
UNION
|
|
|
SELECT DATE_FORMAT(sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
|
|
|
(SELECT user_name FROM sys_user su WHERE su.user_id=xi.user_id) AS jobNumber,
|
|
|
user_name AS userName,
|
|
|
- user_img AS avatar FROM xxp_inspection xi WHERE subject_id=209
|
|
|
+ user_img AS avatar FROM xxp_inspection xi WHERE subject_id=#{subjectId}
|
|
|
AND sign_out IS NULL AND DATE_FORMAT(sign_in,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
|
</select>
|
|
|
|
