问题修改 2023-04-10

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -64,7 +64,7 @@ public class LabBoardApi {
             return ResultData.fail(500, "获取logo失败！");
         }
         map.put("schoolName", logoConfigVo.getSchoolName());
-        map.put("circularLogo", fileConfigUtils.getFileDomainApp()+logoConfigVo.getCircularLogo());
+        map.put("circularLogo", fileConfigUtils.getFileDomainApp()+logoConfigVo.getRectangleLogo());
         ResultData resultData=remoteDutyService.getSubjectName(labId);
         if (resultData == null || resultData.getCode() != 200) {
             return ResultData.fail(500, "获取实验室名称失败！");

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

@@ -583,15 +583,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 valid_end_time <![CDATA[>=]]> now()
     </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 valid_end_time <![CDATA[>=]]> now())-->
         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 valid_end_time <![CDATA[>=]]> now() 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
@@ -601,18 +601,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 valid_end_time <![CDATA[>=]]> now())-->
         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 valid_end_time <![CDATA[>=]]> now())
         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 valid_end_time <![CDATA[>=]]> now() 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.valid_end_time <![CDATA[>=]]> now() 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 valid_end_time <![CDATA[>=]]> now() 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 valid_end_time <![CDATA[>=]]> now() 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