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 108 signIn.setCreateTime(new Date());
109 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 111 if (checkSignIn(signIn, driver)) {
115 112 signIn.setStatus(SIGN_IN_SUCCESS);
116 113 } else {
... ... @@ -181,6 +178,9 @@ public class SignInServiceImpl implements ISignInService {
181 178 SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
182 179 signIn.setCreateTime(new Date());
183 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 185 if (checkSignIn(signIn, driver)) {
186 186 signIn.setStatus(SIGN_IN_SUCCESS);
... ...