Commit c0a67eee1a8ad0715fe1bef434006f9864b5f0d5

Authored by guzijian
1 parent 30ce9c1f

fix: 更新签到逻辑

ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -232,10 +232,8 @@ public class SignInServiceImpl implements ISignInService { @@ -232,10 +232,8 @@ public class SignInServiceImpl implements ISignInService {
232 result = checkWorkDay(signIn, driver.getPosts()); 232 result = checkWorkDay(signIn, driver.getPosts());
233 233
234 // 酒精测试校验 确定 且员工工种是驾驶员 234 // 酒精测试校验 确定 且员工工种是驾驶员
235 - if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && result) {  
236 - if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) > 0) {  
237 - result = true;  
238 - } else { 235 + if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
  236 + if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0) {
239 signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR); 237 signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR);
240 result = false; 238 result = false;
241 } 239 }