Commit f9d5fac53bc66095acad830f3fe3ef9508d32605
1 parent
33ad5ee1
fix: 修改签到逻辑
Showing
1 changed file
with
6 additions
and
2 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
| @@ -134,18 +134,22 @@ public class SignInServiceImpl implements ISignInService { | @@ -134,18 +134,22 @@ public class SignInServiceImpl implements ISignInService { | ||
| 134 | throw new RuntimeException("设备号不能为空"); | 134 | throw new RuntimeException("设备号不能为空"); |
| 135 | } | 135 | } |
| 136 | // 签到检查 | 136 | // 签到检查 |
| 137 | -// checkSignIn(signIn); | 137 | + checkSignIn(signIn); |
| 138 | // base64转图片 | 138 | // base64转图片 |
| 139 | signIn.setCreateTime(new Date()); | 139 | signIn.setCreateTime(new Date()); |
| 140 | signIn.setIp(IpUtils.getIpAddr()); | 140 | signIn.setIp(IpUtils.getIpAddr()); |
| 141 | uploadImage(signIn); | 141 | uploadImage(signIn); |
| 142 | signInMapper.insertSignIn(signIn); | 142 | signInMapper.insertSignIn(signIn); |
| 143 | - return signIn.getStatus().equals(SIGN_IN_SUCCESS) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING): AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark()); | 143 | + return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING): AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark()); |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | private void checkSignIn(SignIn signIn) { | 146 | private void checkSignIn(SignIn signIn) { |
| 147 | // TODO 更具工号获取人员信息 | 147 | // TODO 更具工号获取人员信息 |
| 148 | Driver driver = getDriverInfoByJobCode(signIn.getJobCode()); | 148 | Driver driver = getDriverInfoByJobCode(signIn.getJobCode()); |
| 149 | + if (Objects.isNull(driver)){ | ||
| 150 | + signIn.setStatus(SIGN_IN_SUCCESS); | ||
| 151 | + return; | ||
| 152 | + } | ||
| 149 | // TODO 排班校验 非司售未作 | 153 | // TODO 排班校验 非司售未作 |
| 150 | checkWorkDay(signIn,driver.getPersonnelType()); | 154 | checkWorkDay(signIn,driver.getPersonnelType()); |
| 151 | // TODO 超时校验 | 155 | // TODO 超时校验 |