提示修改 2023-04-13

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

@@ -263,11 +263,11 @@ public class LabXxpInspectionController extends BaseController
         }
         int num=xxpInspectionService.selectNoSignOut(xxpCardInfo.getSubjectId(),xxpInspectionVo.getUserId());
         if(num>0){
-            return ResultData.fail("请你先签退后再进行签到!");
+            return ResultData.fail("当前用户已经签到成功，不能重复签到！");
         }
         int numAccess=iLabSubjectAccessRecordService.getSignOutRecordNoOut(xxpCardInfo.getSubjectId(),xxpInspectionVo.getUserId());
         if(numAccess>0){
-            return ResultData.fail("请你先签退后再进行签到!");
+            return ResultData.fail("当前用户已经签到成功，不能重复签到！");
         }
         ResultData resultData=remoteUserService.getUserMapInfoByUserId(xxpInspectionVo.getUserId());
         if(null==resultData ||resultData.getCode()!= HttpStatus.SUCCESS){
@@ -300,6 +300,7 @@ public class LabXxpInspectionController extends BaseController
     @ApiOperation(value = "巡查签出")
     @PostMapping("/updateInspection")
     public ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId) {
+        logger.info("labId:"+labId+"userId:"+userId);
         return ResultData.result(xxpInspectionService.updateXxpInspectionSignOut(labId,userId));
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -140,7 +140,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
             }
             int num=xxpInspectionService.selectNoSignOut(signInfoVO.getSubId(),signInfoVO.getSingInUser().getUserId());
             if(num>0){
-                messages.add("请你先签退后再进行签到!");
+                messages.add("当前用户已经签到成功，不能重复签到！");
             }
             //1、判断是否有安全准入资格，如没有准入资格进行提示(语音+浮层):验证失败，您需要通过小程序申请实验室准入资格后才能签到。
             if(UserConstants.USER_TYPE_STUDENT.equals(signInPerInfoVO.getSingInUser().getType())){
@@ -393,7 +393,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                             messageSendService.builUserByChange(floorVo.getBuildId());
                         }
                     }else{
-                        return ResultData.fail("当前用户已经签到成功，不能重复签到。");
+                        return ResultData.fail("当前用户已经签到成功，不能重复签到！");
                     }
 
                     //学生登陆时 给奖励分