1、正常签退时间由原先的60分钟延长至80分钟，超出时间属于异常签退。

2、酒精测试2次异常后，不得再次操作。

1、正常签退时间由原先的60分钟延长至80分钟，超出时间属于异常签退。
2、酒精测试2次异常后，不得再次操作。
liujun001
1 parent 0628166f
Showing 10 changed files with 211 additions and 24 deletions
Bsth-admin/src/main/java/com/ruoyi/common/ConstDriverProperties.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/controller/ReportController.java
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ReportDetailResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/ReportService.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/utils/ConstDateUtil.java
Bsth-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -22,5 +22,12 @@ public interface ConstDriverProperties {
     Integer STATUS_NORMAL = 0;
     Integer STATUS_DEACTIVATE = 1;
+    /***
+     *  正常签退时间由原先的60分钟延长至80分钟
+     *
+     * @author liujun
+     * @date 2024/6/11 15:19
+     */
+    public Integer SIGN_OUT_TIME = 80;
 }
 package com.ruoyi.common.cache;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.map.MapUtil;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.errorScheduling.domain.ErrorJobcode;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
@@ -8,9 +10,12 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -18,14 +23,14 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class NowSchedulingCache {
     private final DriverSchedulingMapper schedulingMapper;
-    Logger log = LoggerFactory.getLogger(SchedulingCache.class);
+    static Logger log = LoggerFactory.getLogger(SchedulingCache.class);
     /**
      * 当天初版排班
      */
     private static ConcurrentHashMap<String, Map<String, List<DriverScheduling>>> cacheNowDayScheduling = new ConcurrentHashMap<>();
     private IErrorJobcodeService errorJobcodeService;
-    public NowSchedulingCache(DriverSchedulingMapper driverSchedulingMapper,IErrorJobcodeService errorJobcodeService) {
+    public NowSchedulingCache(DriverSchedulingMapper driverSchedulingMapper, IErrorJobcodeService errorJobcodeService) {
         this.schedulingMapper = driverSchedulingMapper;
         this.errorJobcodeService = errorJobcodeService;
         log.info("项目启动加载中获取排班表并存入缓存-----");
@@ -39,7 +44,7 @@ public class NowSchedulingCache {
         // 查询今天和昨天
         for (int i = 0; i > -2; i--) {
             Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
-            String date = ConstDateUtil.formatDate("yyyy-MM-dd",ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i));
+            String date = ConstDateUtil.formatDate("yyyy-MM-dd", ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i));
             List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
             handlerResultMap(resultMap, schedulingList);
             // 获取错误排班
@@ -47,10 +52,48 @@ public class NowSchedulingCache {
             // 插入错误排班
             errorJobcodeService.insertBatchErrorJobcode(errorScheduling);
             // 更新缓存
-            cacheNowDayScheduling.put(date.replaceAll("-",""), resultMap);
+            cacheNowDayScheduling.put(date.replaceAll("-", ""), resultMap);
         }
     }
+    /***
+     *
+     *  刷新打卡缓本地存信息
+     * @author liujun
+     * @date 2024/6/12 10:37
+     * @param driverScheduling
+     * @param date
+     * @return int 0 为刷新成功、1为传入对象值为空或工号为空或传入的DriverScheduling的ID为空
+     */
+    public  int refreshDriveScheDulingCacheByDateAndJobCode(DriverScheduling driverScheduling, Date date) {
+        if (Objects.isNull(driverScheduling) || Objects.isNull(date) || StringUtils.isEmpty(driverScheduling.getJobCode())
+                || Objects.isNull(driverScheduling.getId())) {
+            log.warn("刷新本地打卡缓存信息失败，传入的对象为空。传入的时间：{},传入的数据对象：{}", date, driverScheduling);
+            return 1;
+        }
+
+        String dateStr = ConstDateUtil.FAST_YYYY_MM_DD.format(date);
+        Map<String, List<DriverScheduling>> resultMap = cacheNowDayScheduling.get(dateStr);
+        if (MapUtil.isEmpty(resultMap)) {
+            return 0;
+        }
+
+        List<DriverScheduling> driverSchedulings = resultMap.get(driverScheduling.getJobCode());
+        int size = CollectionUtils.size(driverSchedulings);
+        if (0 == size) {
+            return 0;
+        }
+
+        for (int i = 0; i < size; i++) {
+            DriverScheduling scheduling = driverSchedulings.get(i);
+            if (Objects.nonNull(scheduling) && Objects.equals(scheduling.getId(), driverScheduling.getId())) {
+                driverSchedulings.set(i, driverScheduling);
+                break;
+            }
+        }
+        return 0;
+    }
+
     public static void handlerResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
         for (DriverScheduling scheduling : schedulingList) {
@@ -110,7 +153,7 @@ public class NowSchedulingCache {
      */
     public void updateCacheByJobCode(String remark, String key, Integer index, SignIn signIn) {
         if (key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(0)))
-                || key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1)))){
+                || key.equals(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1)))) {
             DriverScheduling scheduling = cacheNowDayScheduling.get(key).get(signIn.getJobCode()).get(index);
             scheduling.setSignInId(signIn.getId());
             scheduling.setRemark(remark);
@@ -13,12 +13,14 @@ import com.ruoyi.system.domain.SysNotice;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.List;
 /**
@@ -50,6 +52,38 @@ public class ReportController {
         return AjaxResult.success(reportService.getReportDetail(requestVo, response));
     }
+    @ApiOperation("修改酒精打卡异常次数")
+    @PreAuthorize("@ss.hasPermi('system:report:signUpdateStatus')")
+    @GetMapping("/update/alcohol/exception/count/{id}/{alcoholIntake}")
+    public AjaxResult updateAlcoholExceptionCountById(@PathVariable Integer id, @PathVariable BigDecimal alcoholIntake) {
+        int result = reportService.updateAlcoholExceptionCountById(id, alcoholIntake);
+        AjaxResult ajaxResult;
+        switch (result) {
+            case 1:
+                ajaxResult = AjaxResult.error("再签到报表中没有找到数据，请核对数据后再操作");
+                break;
+            case 2:
+                ajaxResult = AjaxResult.error("没有找到签到数据，请核对数据后再操作");
+                break;
+            case 3:
+                ajaxResult = AjaxResult.error("不是酒驾数据，不能修改，请核对数据后再操作");
+                break;
+
+            case 4:
+                ajaxResult = AjaxResult.error("不是签到数据，不能修改，请核对数据后再操作");
+                break;
+
+            case 5:
+                ajaxResult = AjaxResult.error("不是司机的数据，不能修改，请核对数据后再操作");
+                break;
+
+            default:
+                ajaxResult = AjaxResult.success();
+                break;
+        }
+        return ajaxResult;
+    }
+
     @ApiOperation("异常报表集合查询")
     @GetMapping("/error/list")
     public AjaxResult getErrorList(@ApiParam @ModelAttribute ReportErrorRequestVo request) {
@@ -21,8 +21,10 @@ public interface DriverSchedulingMapper {
     List<DriverScheduling> queryToDay(@Param("date") String date, @Param("name") String name,@Param("jobCode") String jobCode,@Param("lineName")String lineName );
-    void updateRoster(@Param("scheduling") DriverScheduling scheduling, @Param("signInId") Long id, @Param("exType") Integer exType, @Param("signTime")Date signTime, @Param("remark") String remark, @Param("signType") Integer signType, @Param("alcoholFlag") Integer alcoholFlag, @Param("alcoholIntake")BigDecimal alcoholIntake);
+
+    void updateRoster(@Param("scheduling") DriverScheduling scheduling, @Param("signInId") Long id, @Param("exType") Integer exType, @Param("signTime")Date signTime, @Param("remark") String remark, @Param("signType") Integer signType, @Param("alcoholFlag") Integer alcoholFlag, @Param("alcoholIntake")BigDecimal alcoholIntake);
+    void updateRosterById(DriverScheduling scheduling);
     /**
      * 查询设备数量
      * @return
@@ -32,4 +34,12 @@ public interface DriverSchedulingMapper {
     List<DriverScheduling> queryByMonth(@Param("startDate") String startDate,@Param("endDate") String endDate);
+    /***
+     *  根据ID查询对象的业务字段
+     * @author liujun
+     * @date 2024/6/12 9:38
+     * @param id
+     * @return com.ruoyi.domain.DriverScheduling
+     */
+    DriverScheduling querySelectColumnById(Integer id);
 }
@@ -159,6 +159,7 @@ public class SignInServiceImpl implements ISignInService {
         // 查询员工信息
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
         if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
+
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
         SignInResponseVo vo = getSignInResponseVo(driver, signIn, equipment);
@@ -169,6 +170,15 @@ public class SignInServiceImpl implements ISignInService {
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         handleSignBody(signIn, driver, globalIndex, now, dto);
+        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
+            AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
+            if (!Objects.isNull(result)) {
+                String msg = "签到异常: 请使用手持式酒精测试棒进行酒测";
+                result.put(AjaxResult.MSG_TAG, msg);
+                return result;
+            }
+        }
+
         uploadImage(signIn, vo);
         signInMapper.insertSignIn(signIn);
         // 更新考勤
@@ -200,12 +210,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     private AjaxResult handleAjaxResult(SignIn signIn, Driver driver, SignInResponseVo vo) {
-        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && SIGN_IN_FAIL.equals(signIn.getStatus()) && signIn.getRemark().contains(ALCOHOL_SIGN_IN_ERROR)) {
-            AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
-            if (!Objects.isNull(result)) {
-                return result;
-            }
-        }
+
         // 酒精测试后续恢复的需要删除异常的酒测缓存
         if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
@@ -561,7 +566,7 @@ public class SignInServiceImpl implements ISignInService {
                     DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 给出签到范围
                     // 上一次无记|签到,type:签退  当前时间小于最近签到时间 -> 超时签退
-                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
+                    if (nowBetween < -SIGN_OUT_TIME && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT) && lastClosestTimestamp.getBcType().equals(BC_TYPE_IN)) {
                         signIn.setRemark(SIGN_OUT_TIMEOUT + getPrompt(lastClosestTimestamp));
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
@@ -578,7 +583,7 @@ public class SignInServiceImpl implements ISignInService {
                 if (currentScheduling.getBcType().equals(BC_TYPE_IN) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignInRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
                     // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
-                    if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
+                    if (nowBetween < -SIGN_OUT_TIME && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_IN)) {
                         signIn.setRemark(SIGN_IN_TIMEOUT + getPrompt(lastClosestTimestamp));
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
@@ -622,7 +627,7 @@ public class SignInServiceImpl implements ISignInService {
     private boolean handleTimeOut(String bcType, long nowBetween, GlobalIndex globalIndex, DriverSignInRecommendation currentScheduling) {
         if ((BC_TYPE_OUT.equals(bcType) && nowBetween > 0L)
-                || (BC_TYPE_IN.equals(bcType) && nowBetween > 60L)) {
+                || (BC_TYPE_IN.equals(bcType) && nowBetween > SIGN_OUT_TIME)) {
             return true;
         } else {
             return false;
@@ -638,7 +643,7 @@ public class SignInServiceImpl implements ISignInService {
         } else {
             // 延后一小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
-            LocalDateTime addHours = time.plusHours(1);
+            LocalDateTime addHours = time.plusMinutes(80);
             return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到"
                     + ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
         }
@@ -650,8 +655,8 @@ public class SignInServiceImpl implements ISignInService {
         if (BC_TYPE_OUT.equals(bcType)) {
             return !(nowBetween <= 0L && nowBetween >= -60L);
         } else {
-            // 如果是签退就是就是延后一小时内有效
-            return !(nowBetween <= 60 && nowBetween >= 0L);
+            // 如果是签退就是就是延后80分钟内有效
+            return !(nowBetween <= SIGN_OUT_TIME && nowBetween >= 0L);
         }
     }
@@ -663,7 +668,7 @@ public class SignInServiceImpl implements ISignInService {
         globalIndex.setIndex(0);
         // 单条数据 且不在范围内
         if (BC_TYPE_IN.equals(dto.get(0).getBcType())) {
-            if (!(nowBetween < 0L && nowBetween >= -60L)) {
+            if (!(nowBetween < 0L && nowBetween >= -SIGN_OUT_TIME)) {
                 signIn.setRemark(SIGN_OUT_TIMEOUT);
                 return false;
             } else {
@@ -765,4 +770,5 @@ public class SignInServiceImpl implements ISignInService {
 //        }
         return type;
     }
+
 }
@@ -3,6 +3,7 @@ package com.ruoyi.pojo.response;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import java.math.BigDecimal;
 import java.util.Date;
 /**
@@ -11,6 +12,7 @@ import java.util.Date;
 @Data
 @ApiModel("签到报表查看详情vo")
 public class ReportDetailResponseVo {
+    private Long id;
     private String jobCode;
     private String name;
     private String posts;
@@ -20,6 +22,9 @@ public class ReportDetailResponseVo {
     private String nbbm;
     private String exString;
     private String siteName;
+    private Integer exType;
+    private BigDecimal alcoholIntake;
+    private Date scheduleDate;
     /**
      * 计划操作
      */
@@ -5,13 +5,19 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.ruoyi.common.SignStatusEnum;
+import com.ruoyi.common.cache.NowSchedulingCache;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
+import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
@@ -21,6 +27,8 @@ import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ToolUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Scheduler;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
@@ -44,17 +53,22 @@ import java.util.stream.Collectors;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstDriverProperties.PERSONNEL_POSTS_DRIVER;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ReportProperties.*;
+import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
  * @author 20412
  */
 @Service
+@Slf4j
 public class ReportService {
     @Autowired
     private SignInMapper signInMapper;
+    @Autowired
+    private DriverMapper driverMapper;
     @Autowired
     private ISysNoticeService noticeService;
@@ -68,6 +82,12 @@ public class ReportService {
     @Autowired
     private DriverSchedulingMapper schedulingMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private NowSchedulingCache nowSchedulingCache;
+
     /**
      * 查询报表信息
      */
@@ -170,7 +190,7 @@ public class ReportService {
                     data.add(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", vo.getCreateTime()));
                     if (vo.getSignType() == null) {
                         data.add("");
-                    }else {
+                    } else {
                         data.add(vo.getSignType().equals(SIGN_IN) ? "签到" : "签退");
                     }
                 } else {
@@ -349,6 +369,48 @@ public class ReportService {
         return responseVos;
     }
+    public Integer updateAlcoholExceptionCountById(Integer id, BigDecimal alcoholIntake) {
+        DriverScheduling driverScheduling = schedulingMapper.querySelectColumnById(id);
+        if (Objects.isNull(driverScheduling)) {
+            log.warn("{}没有签到数据", id);
+            return 1;
+        }
+
+        SignIn signIn = signInMapper.selectSignInById(driverScheduling.getSignInId());
+        if (Objects.isNull(signIn)) {
+            log.warn("{}没有查到签到数据", id);
+            return 2;
+        }
+
+        if (!Objects.equals(3, driverScheduling.getExType())) {
+            log.warn("{}不是酒驾数据，不能修改", id);
+            return 3;
+        }
+
+        if (!Objects.equals(1, signIn.getType())) {
+            log.warn("{}不是签到数据，不能修改", id);
+            return 4;
+        }
+
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver) || !Objects.equals(PERSONNEL_POSTS_DRIVER, driver.getPosts())) {
+            log.warn("{}只能修改司机的数据", id);
+            return 5;
+        }
+
+
+        schedulingMapper.updateRoster(driverScheduling, driverScheduling.getSignInId(), SignStatusEnum.SIGN_STATUS_ZONE_ENUM.getStatus(), driverScheduling.getSignTime(),
+                SignStatusEnum.SIGN_STATUS_ZONE_ENUM.getDescription(), driverScheduling.getSignType(), driverScheduling.getAlcoholFlag(), alcoholIntake);
+
+        nowSchedulingCache.refreshDriveScheDulingCacheByDateAndJobCode(driverScheduling, driverScheduling.getScheduleDate());
+
+
+        String key = REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.FAST_YYYY_MM_DD.format(driverScheduling.getScheduleDate()) + ":" + signIn.getJobCode();
+        redisCache.setCacheObject(key, 0, 1, TimeUnit.DAYS);
+
+        return 0;
+    }
+
     private void handlerReportDetail(ReportDetailResponseVo reportDetailResponseVo, DriverScheduling scheduling) {
         BeanUtils.copyProperties(scheduling, reportDetailResponseVo);
         reportDetailResponseVo.setPlanAction(scheduling.getBcType().equals(BC_TYPE_OUT) ? SIGN_IN_STRING : SIGN_IN_OUT_STRING);
@@ -26,8 +26,7 @@ import java.time.YearMonth;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
-import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
-import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.ReportProperties.NOW;
@@ -145,7 +144,7 @@ public class SchedulingService {
         long date = scheduling.getBcType().equals(BC_TYPE_IN) ? scheduling.getZdsjT() : scheduling.getFcsjT();
         long nowBetween = ChronoUnit.MINUTES.between(ConstDateUtil.getLocalDateTimeByLongTime(date), ConstDateUtil.getLocalDateTimeByLongTime(signIn.getCreateTime().getTime()));
         if (SignInServiceImpl.checkTimerSign(nowBetween, scheduling.getBcType())) {
-            if (nowBetween < -60L || (BC_TYPE_IN.equals(scheduling.getBcType()) && nowBetween < 0L)) {
+            if (nowBetween < -SIGN_OUT_TIME || (BC_TYPE_IN.equals(scheduling.getBcType()) && nowBetween < 0L)) {
                 sb.append(EARLY);
             } else {
                 sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
@@ -220,7 +219,7 @@ public class SchedulingService {
                     ConstDateUtil.formatDate("HH:mm", time) + "之间打卡";
         } else {
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", date), "yyyy-MM-dd HH:mm:ss");
-            LocalDateTime addHours = time.plusHours(1);
+            LocalDateTime addHours = time.plusMinutes(80);
             return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到" +
                     ConstDateUtil.formatDate("HH:mm", addHours) + "之间打卡";
         }
 package com.ruoyi.utils;
+import org.apache.commons.lang3.time.FastDateFormat;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.*;
@@ -11,6 +13,9 @@ import java.util.List;
 public class ConstDateUtil {
+   public static final FastDateFormat FORMAT_YYYY_MM_DD_HORIZONTAIL_LINE = FastDateFormat.getInstance("yyyy-MM-dd");
+   public static final FastDateFormat FAST_YYYY_MM_DD = FastDateFormat.getInstance("yyyyMMdd");
+
     public static String getStringNowLocalDate(){
         // 指定当前日期和时间
         LocalDate currentDate = LocalDate.now();
@@ -22,7 +22,15 @@
         <result column="sign_time" property="signTime" jdbcType="DATETIMEOFFSET"/>
         <result column="alcohol_flag" property="alcoholFlag" jdbcType="DATETIMEOFFSET"/>
         <result column="alcohol_intake" property="alcoholIntake"/>
+        <result column="sign_type" property="signType"></result>
+        <result column="remark" property="remark"></result>
     </resultMap>
+
+    <sql id="selectColumn">
+       id, job_code,name,posts,schedule_date,line_name,lp_name,nbbm,bc_type,fcsj_t,zdsj_t,sign_in_id,ex_type,sign_time,alcohol_flag,alcohol_intake,sign_type,remark
+    </sql>
+
+
     <insert id="insertRoster" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         insert into scheduling (schedule_date,line_name,job_code,`name`,posts,lp_name,nbbm,bc_type,fcsj_t,zdsj_t)
         values
@@ -55,6 +63,10 @@
         where id = #{scheduling.id}
     </update>
+    <update id="updateRosterById" parameterType="com.ruoyi.domain.DriverScheduling">
+
+    </update>
+
     <select id="queryToDay" resultType="com.ruoyi.domain.DriverScheduling" resultMap="Scheduling">
         select scheduling.*,driver.fleet_name fleetName,equipment.site_name siteName from
         scheduling left join driver on scheduling.job_code = driver.job_code
@@ -86,4 +98,8 @@
         where schedule_date &gt;= #{startDate}
           and schedule_date &lt;= #{endDate}
     </select>
+
+    <select id="querySelectColumnById" parameterType="java.lang.Integer" resultMap="Scheduling">
+        select <include refid="selectColumn"></include> from scheduling where id=#{id}
+    </select>
 </mapper>
 \ No newline at end of file