Merge remote-tracking branch 'origin/dev' into dev

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSecurityApplyMapper.xml

@@ -587,15 +587,15 @@
           SELECT  id id,user_id userId,user_name userName,date_format(valid_begin_time,'%Y-%m-%d') validBeginTime,date_format(valid_end_time,'%Y-%m-%d') validEndTime,
           (SELECT avatar FROM sys_user WHERE user_id=lab.user_id) AS avatar,
           (SELECT user_name FROM sys_user WHERE user_id=lab.user_id) AS jobNumber
-                FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time <![CDATA[>=]]> now()
+                FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d')
     </select>
 
     <!--获取准入人员的手指信息-->
     <select id="selectSecurityFingerList" resultType="java.util.Map">
             <!--SELECT  finger,user_id userId,user_name userName,user_type userType FROM  xxp_user_auth WHERE user_id IN (SELECT user_id
-                FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time <![CDATA[>=]]> now())-->
+                FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} and DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d'))-->
         SELECT  xxp.finger,xxp.user_id userId,xxp.user_name userName,xxp.user_type userType FROM  xxp_user_auth xxp WHERE (SELECT user_id
-        FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND valid_end_time <![CDATA[>=]]> now() AND xxp.user_id=lab.user_id)>0
+        FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d') AND xxp.user_id=lab.user_id)>0
         UNION
         SELECT  xxp.finger,xxp.user_id userId,xxp.user_name userName,xxp.user_type userType FROM  xxp_user_auth xxp WHERE (SELECT COUNT(user_id)
         FROM  lab_whitelist AS lw INNER JOIN lab_white_join_sublist lwjs ON lw.user_id=lwjs.white_user_id WHERE  xxp.user_id=lw.user_id AND lwjs.subject_id=#{subjectId})>0
@@ -605,18 +605,18 @@
     <!--获取准入人员的卡号信息-->
     <select id="selectSecurityCardList" resultType="java.util.Map">
             <!--SELECT  card_num_simple cardNum,user_id userId, nick_name userName,user_type userType FROM  sys_user WHERE user_id IN (SELECT user_id
-                FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time <![CDATA[>=]]> now())-->
+                FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} and DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d'))-->
         SELECT  card_num_simple cardNum,user_id userId, nick_name userName,user_type userType,0 AS isWhite FROM  sys_user WHERE user_id IN (SELECT user_id
-        FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} AND valid_end_time <![CDATA[>=]]> now())
+        FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} AND DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d'))
         UNION
         SELECT (SELECT card_num_simple FROM sys_user su WHERE su.user_id=lw.user_id) cardNum, user_id userId,user_name userName,(SELECT user_type FROM sys_user su WHERE su.user_id=lw.user_id) AS userType,1 AS isWhite  FROM  lab_whitelist lw INNER JOIN `lab_white_join_sublist` lwjs ON lw.user_id=lwjs.white_user_id WHERE subject_id=#{subjectId}
     </select>
 
     <select id="selectCountLabSecurityUserId" resultType="java.util.Map">
      <!--SELECT user_id userId,user_name userName,user_type userType
-                FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} and valid_end_time <![CDATA[>=]]> now() and user_id=#{userId}-->
+                FROM  lab_security_apply  WHERE audit_status=2 AND subject_id=#{subjectId} and DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d') and user_id=#{userId}-->
         SELECT user_id userId,user_name userName,user_type userType,0 AS isWhite
-        FROM  lab_security_apply lsp WHERE (lsp.audit_status=2 AND lsp.subject_id=#{subjectId} AND lsp.valid_end_time <![CDATA[>=]]> now() AND lsp.user_id=#{userId})
+        FROM  lab_security_apply lsp WHERE (lsp.audit_status=2 AND lsp.subject_id=#{subjectId} AND lsp.DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d') AND lsp.user_id=#{userId})
         UNION
         SELECT  user_id userId,user_name userName,(SELECT user_type FROM sys_user su WHERE su.user_id=lw.user_id) AS userType,1 AS isWhite  FROM  lab_whitelist lw INNER JOIN lab_white_join_sublist lwjs ON lw.user_id=lwjs.white_user_id WHERE lw.user_id=#{userId} AND lwjs.subject_id=#{subjectId}
     </select>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabStudentsInfoMapper.xml

@@ -73,12 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!--SELECT  join_students_id,face_feature  FROM  `lab_students_info` WHERE join_students_id  IN ( SELECT user_id
                 FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND valid_end_time >= NOW())-->
         <!-- SELECT  join_students_id,face_feature  FROM  `lab_students_info` lsi WHERE (SELECT COUNT(*)
-         FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND valid_end_time <![CDATA[>=]]> now() AND lab.user_id=lsi.user_id )>0
+         FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d') AND lab.user_id=lsi.user_id )>0
          UNION
          SELECT  join_students_id,face_feature  FROM  `lab_students_info` lsi  WHERE (SELECT COUNT(*)
          FROM  lab_whitelist AS lw WHERE  lsi.user_id=lw.user_id)>0-->
          SELECT  join_students_id as user_id,face_feature,(SELECT nick_name  FROM  sys_user su WHERE su.user_id=lsi.user_id) AS user_name,(SELECT user_type  FROM  sys_user su WHERE su.user_id=lsi.user_id) AS user_type,0 AS is_white FROM  `lab_students_info` lsi WHERE (SELECT COUNT(*)
-         FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND valid_end_time <![CDATA[>=]]> now() AND lab.user_id=lsi.user_id )>0
+         FROM  lab_security_apply AS lab WHERE audit_status=2 AND subject_id=#{subjectId} AND DATE_FORMAT(valid_end_time,'%Y-%m-%d') >= DATE_FORMAT(NOW(),'%Y-%m-%d') AND lab.user_id=lsi.user_id )>0
          UNION
          SELECT  join_students_id user_id,face_feature,(SELECT nick_name  FROM  sys_user su WHERE su.user_id=lsi.user_id) AS user_name,(SELECT user_type  FROM  sys_user su WHERE su.user_id=lsi.user_id) AS user_type,1 AS is_white  FROM  `lab_students_info` lsi  WHERE (SELECT COUNT(*)
          FROM  lab_whitelist AS lw INNER JOIN lab_white_join_sublist lwjs ON lw.user_id=lwjs.white_user_id WHERE  lsi.user_id=lw.user_id AND lwjs.subject_id=#{subjectId})>0

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectAccessRecordMapper.xml

@@ -498,7 +498,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          WHERE ar.`out_time` IS NULL AND TIMESTAMPDIFF(HOUR,ar.in_time,NOW())>=st.sign_time AND ar.access_status=1 and ar.init_flag = 0
     </select>
     <select id="selectSubjectSignList" resultType="java.util.Map">
-        select
+        <!--select
                DATE_FORMAT(lsar.in_time,'%Y-%m-%d %H:%i:%s') AS signTime,
                su.user_name as jobNumber,
                su.nick_name as userName,
@@ -506,7 +506,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           from  lab_subject_access_record lsar
         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
+        and init_flag=0-->
+
+        SELECT
+        DATE_FORMAT(lsar.in_time,'%Y-%m-%d %H:%i:%s') AS signTime,
+        su.user_name AS jobNumber,
+        su.nick_name AS userName,
+        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
+        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
+        AND sign_out IS NULL AND DATE_FORMAT(sign_in,'%Y-%m-%d')=DATE_FORMAT(NOW(),'%Y-%m-%d')
     </select>
 
     <select id="getSignOutRecordNoOut" resultType="java.lang.Integer">