对接问题修改 2023-04-09

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/vo/XxpInspectionVo.java

@@ -49,6 +49,14 @@ public class XxpInspectionVo extends BaseEntity {
     @ApiModelProperty(value = "实验室id")
     private Long  subjectId;
 
+
+    /**
+     * 实验室id
+     */
+    @Excel(name = "传参用实验室id")
+    @ApiModelProperty(value = "传参用实验室id")
+    private Long  labId;
+
     /**
      * 实验室名称
      */

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

@@ -533,7 +533,7 @@ public class LabBoardApi {
     @ApiOperation(value = "巡查签退")
     @PostMapping(value = "/XxpInspection/addInspection/signOut")
     public ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId){
-        return ResultData.success(remoteDutyService.updateInspection(labId,userId));
+        return remoteDutyService.updateInspection(labId,userId);
     }
 
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpCardInfoController.java

@@ -241,4 +241,47 @@ public class LabXxpCardInfoController extends BaseController {
         return ResultData.success(map);
     }
 
+
+
+    /**
+     * 验证用户签退走巡查签退还是准入签退
+     * @param labId 实验室id
+     * @param userId 用户id
+     * @return
+     */
+    @RequestMapping("/validateUser")
+    public ResultData validateUser(Long labId, Long userId) {
+        Integer isDutyUser=0;
+        Map<String,Object> map=iLabSecurityApplyService.selectCountLabSecurityUserId(labId,userId);
+        if(null==map){
+            return ResultData.fail("未获得实验室准入资格；");
+        }
+        String userType=String.valueOf(map.get("userType"));
+        String isWhite=String.valueOf(map.get("isWhite"));
+        //如果是学生 或者白名单的老师 进二类页面
+        if(userType.equals("22") || (userType.equals("11") && isWhite.equals("0"))){
+            map.put("pageType",2);
+        }
+        int number=iLabSubjectService.isAdminOrSafeUser(labId,userId);
+        //一类首页对应身份为白名单老师、实验室负责人、安全责任人
+        if(number>0 || (userType.equals("11") && isWhite.equals("1"))){
+            map.put("pageType",1);
+        }
+        map.remove("isWhite");
+        String dateTime = DateUtils.getDate();
+        List<Map<String,Object>> list = iXxpDutyService.selectDutyUser(labId,dateTime);
+        //判断是否当天值班
+        for(Map<String,Object> dutyMap:list){
+            String userObj=String.valueOf(dutyMap.get("userId"));
+            if(StringUtils.isNotEmpty(userObj) && StringUtils.isNotNull(userObj)){
+                if(Long.parseLong(userObj)==userId){
+                    isDutyUser=1;
+                    break;
+                }
+            }
+        }
+        map.put("isDutyUser",isDutyUser);
+        return ResultData.success(map);
+    }
+
 }

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

@@ -593,8 +593,8 @@
         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
         UNION
-        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_whitelist AS lw WHERE  xxp.user_id=lw.user_id)>0
+        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
 
     </select>
 
@@ -605,7 +605,7 @@
         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())
         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
+        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">
@@ -614,7 +614,7 @@
         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})
         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 WHERE lw.user_id=#{userId}
+        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>
 
 </mapper>

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

@@ -81,8 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          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 WHERE  lsi.user_id=lw.user_id)>0
-     </select>
+         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
+
+    </select>
 
      <insert id="insertLabStudentsInfo" parameterType="com.zd.system.api.entity.LabStudentsInfo">
          insert into lab_students_info