feat: 修改检测设备

guzijian
1 parent a19ff945
Showing 2 changed files with 9 additions and 16 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -357,24 +357,18 @@ public class DriverServiceImpl implements IDriverService {
         return vos;
     }
  
+    /**
+     * 100一下的都设置为有酒精测试的设备
+     * @param deviceId
+     * @return
+     */
     public static boolean doCheckDevice(String deviceId) {
         if (StringUtil.isEmpty(deviceId)){
             return true;
         }
-        switch (deviceId){
-            case "001":
-            case "002":
-            case "003":
-            case "004":
-            case "005":
-            case "006":
-            case "007":
-            case "008":
-            case "009":
-            case "010":
-            case "011":
-            case "012":
-                return true;
+        int num = Integer.parseInt(deviceId);
+        if (num < 101){
+            return true;
         }
         return false;
     }
@@ -261,7 +261,6 @@ public class SignInServiceImpl implements ISignInService {
  
     @Override
     public AjaxResult supplementarySignature(SignIn signIn) {
-        signIn.setRemark("");
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
         if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
         GlobalIndex globalIndex = new GlobalIndex();
@@ -269,7 +268,7 @@ public class SignInServiceImpl implements ISignInService {
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         handleSignBody(signIn, driver, globalIndex, now, dto);
         signIn.setUpdateBy(SecurityUtils.getUsername());
-
+        signIn.setRemark("补签");
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         if (CollectionUtil.isNotEmpty(dto)) {