信息牌接口对接调整 2023-03-31

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

@@ -76,7 +76,7 @@ public class LabBoardApi {
         //查询实验室负责人和安全负责人
         LabXxpSubjectVo vo = new LabXxpSubjectVo();
         ResultData resultData = remoteDutyService.getXxpSubjectInfo(labId);
-        if (null != resultData || resultData.getCode() != 200) {
+        if (null == resultData || resultData.getCode() != 200) {
             return ResultData.fail("获取实验室信息失败！");
         }
         Map<String, Object> map = (Map<String, Object>) resultData.getData();

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

@@ -498,7 +498,8 @@ 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 lsar.in_time as signTime,
+        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

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

@@ -66,26 +66,24 @@
     </select>
 
     <select id="selectUserXxpInspectionList" resultType="java.util.Map">
-
-    SELECT i.user_id userId,
-                i.user_name userName,
-                i.user_img avatar,
-                DATE_FORMAT(i.sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
-                date_format(MAX(i.sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
-                COUNT(1) AS signNumber,
-                d.duty_time dutyTime
-                FROM  `xxp_inspection` i left join xxp_duty d on DATE_FORMAT(i.sign_in,'%Y-%m-%d') = DATE_FORMAT(d.duty_time,'%Y-%m-%d')
-                and i.user_id = d.user_id and i.subject_id = d.subject_id
-                WHERE i.subject_id=#{labId} GROUP BY i.sign_in,i.user_id
-
-     <!--SELECT user_id userId,
-            user_name userName,
-            user_img userImg,
-            DATE_FORMAT(sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
-            date_format(MAX(sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
-            COUNT(*) AS signNumber
-            FROM  `xxp_inspection` WHERE subject_id=#{labId} GROUP BY signTime,user_id
-            -->
+        SELECT i.user_id userId,
+               i.user_name userName,
+               i.user_img avatar,
+               (SELECT phonenumber  FROM  sys_user su WHERE su.user_id=i.user_id ) AS userPhone,
+               DATE_FORMAT(i.sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
+               DATE_FORMAT(i.sign_in,'%Y-%m-%d') AS dutyTime,
+               DATE_FORMAT(MAX(i.sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
+               COUNT(1) AS signNumber
+        FROM  `xxp_inspection` i
+        WHERE i.subject_id=#{labId} GROUP BY dutyTime,i.user_id
+        <!--SELECT user_id userId,
+               user_name userName,
+               user_img userImg,
+               DATE_FORMAT(sign_in,'%Y-%m-%d %H:%i:%s') AS signTime,
+               date_format(MAX(sign_out),'%Y-%m-%d %H:%i:%s') AS signOut,
+               COUNT(*) AS signNumber
+               FROM  `xxp_inspection` WHERE subject_id=#{labId} GROUP BY signTime,user_id
+               -->
     </select>
 
     <insert id="insertXxpInspection" parameterType="com.zd.laboratory.domain.XxpInspection">