guzijian / bsth-alcohol-sign · Commits

Commit c7d6a2a7debf65dd1fe86d6a2ec81ba2e6892422

Authored by guzijian
1 parent 41e77df2

fix: 更新检测逻辑

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
  View file @c7d6a2a
@@ -108,9 +108,6 @@ public class SignInServiceImpl implements ISignInService { @@ -108,9 +108,6 @@ public class SignInServiceImpl implements ISignInService {
108 signIn.setCreateTime(new Date()); 108 signIn.setCreateTime(new Date());
109 signIn.setRemark(""); 109 signIn.setRemark("");
110 // 签到检查 酒精检查 超时检查 排班检查 110 // 签到检查 酒精检查 超时检查 排班检查
111 - if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")){  
112 - return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);  
113 - }  
114 if (checkSignIn(signIn, driver)) { 111 if (checkSignIn(signIn, driver)) {
115 signIn.setStatus(SIGN_IN_SUCCESS); 112 signIn.setStatus(SIGN_IN_SUCCESS);
116 } else { 113 } else {
@@ -181,6 +178,9 @@ public class SignInServiceImpl implements ISignInService { @@ -181,6 +178,9 @@ public class SignInServiceImpl implements ISignInService {
181 SignInResponseVo vo = getSignInResponseVo(signIn, equipment); 178 SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
182 signIn.setCreateTime(new Date()); 179 signIn.setCreateTime(new Date());
183 signIn.setRemark(""); 180 signIn.setRemark("");
  181 + if (signIn.getJobCode().equals("700002") || signIn.getJobCode().equals("700001")){
  182 + return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
  183 + }
184 // 签到检查 184 // 签到检查
185 if (checkSignIn(signIn, driver)) { 185 if (checkSignIn(signIn, driver)) {
186 signIn.setStatus(SIGN_IN_SUCCESS); 186 signIn.setStatus(SIGN_IN_SUCCESS);