fix: 更新提示语

guzijian
1 parent fc25cfea
Showing 1 changed file with 5 additions and 4 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -112,6 +112,7 @@ public class SignInServiceImpl implements ISignInService {
             signIn.setStatus(SIGN_IN_SUCCESS);
         } else {
             signIn.setStatus(SIGN_IN_FAIL);
+            signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
         }
         signIn.setIp(IpUtils.getIpAddr());
         // base64转图片
@@ -126,8 +127,8 @@ public class SignInServiceImpl implements ISignInService {
                 return result;
             }
         }
-        if (SIGN_IN_FAIL.equals(signIn.getStatus())){
-            return AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark(), vo);
+        if (SIGN_IN_FAIL.equals(signIn.getStatus())) {
+            return AjaxResult.error(SIGN_IN_ERROR + ":" + signIn.getRemark(), vo);
         }
         return AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo);
     }
@@ -220,7 +221,7 @@ public class SignInServiceImpl implements ISignInService {
             count = redisCache.setIncrementMapValue(key, signIn.getJobCode(), 1);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
-            return AjaxResult.warn(SIGN_IN_ERROR + ": "+ signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
+            return AjaxResult.warn(SIGN_IN_ERROR + ": " + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
         }
         return null;
     }
@@ -235,7 +236,7 @@ public class SignInServiceImpl implements ISignInService {
         // 酒精测试校验 确定 且员工工种是驾驶员
         if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
-            if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0)  {
+            if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0) {
                 signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR);
                 result = false;
             }