fix: 新增显示字段

guzijian
1 parent f1152152
Showing 20 changed files with 205 additions and 67 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/ConstSignInConstSignInProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/ReportProperties.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverSchedulingMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/DriverSignRecommendation.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/GlobalIndex.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportViewRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/DriverResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/DriverSignInRecordResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportDetailResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/driver_scheduling/DriverSchedulingMapper.xml
@@ -13,6 +13,9 @@ public interface ConstSignInConstSignInProperties {
     String SIGN_NO_SCHEDULING_EX_NUM_STRING = "无排班异常";
     Integer SIGN_ALCOHOL_EX_NUM = 3;
     String SIGN_ALCOHOL_EX_NUM_STRING = "酒精超标异常";
+
+    String HAVE_EX = "有异常";
+    String NO_EX = "无异常";
     /**
      * 未完成人脸注册
      */
 package com.ruoyi.common;
 public interface ReportProperties {
+    Integer NOW = 0;
     Integer DAY = 1;
     Integer MONTH = 2;
 }
@@ -47,12 +47,10 @@ public class SchedulingCache {
         String url = getUrl(formatNowDate);
         log.info("初始化排班数据:{}", formatNowDate);
         saveSchedulingToCache(url, formatNowDate);
-        log.info("开始获取{}的排班数据", formatNowDate);
         String formatYesterdayDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
-        url = getUrl(formatYesterdayDate);
         log.info("初始化排班数据:{}", formatYesterdayDate);
+        url = getUrl(formatYesterdayDate);
         saveSchedulingToCache(url, formatYesterdayDate);
-        log.info("开始获取{}的排班数据", formatYesterdayDate);
     }
     private String getUrl(String formatNowDate) {
@@ -175,6 +173,14 @@ public class SchedulingCache {
         cacheScheduling.remove(key);
     }
+    public List<String> getKeys(){
+        return new ArrayList<>(cacheScheduling.keySet());
+    }
+
+    public Integer size(){
+        return cacheScheduling.size();
+    }
+
     public List<ResponseSchedulingDto> getCacheSchedulingMapValueByHKey(String key, String HKey) {
         if (Objects.isNull(cacheScheduling.get(key))) {
             return null;
@@ -10,6 +10,7 @@ import com.ruoyi.service.ReportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +37,12 @@ public class ReportController {
         return AjaxResult.success(reportService.getReportScrollViewTable(requestVo,response));
     }
+    @ApiOperation("获取详情")
+    @GetMapping("/detail")
+    public AjaxResult getDetail(HttpServletResponse response, @ApiParam @ModelAttribute @Validated ReportViewRequestVo requestVo) {
+        return AjaxResult.success(reportService.getReportDetail(requestVo,response));
+    }
+
     @ApiOperation("异常报表集合查询")
     @GetMapping("/error/list")
@@ -17,7 +17,7 @@ public interface DriverSchedulingMapper {
     void insertRoster(@Param("list") List<DriverScheduling> list);
-    List<DriverScheduling> queryToDay(@Param("date") String date, @Param("jobCode") String jobCode);
+    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);
@@ -324,18 +324,18 @@ public class DriverServiceImpl implements IDriverService {
             if (BC_TYPE_OUT.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
                 // 售票员无需酒精测试
                 if (item.getPosts().equals(PERSONNEL_POSTS_DRIVER))
-                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, alcoholFlag, schedulingFlag);
+                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName());
                 else
-                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, !alcoholFlag, schedulingFlag);
+                    vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_STRING, !alcoholFlag, schedulingFlag,item.getNbbm(),item.getLpName());
             } else if (BC_TYPE_IN.equals(item.getBcType()) && !CollectionUtil.isEmpty(drivers)) {
-                vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag);
+                vo = new DriverResponseVo(item.getTimestamps(), drivers.get(0), SIGN_IN_OUT_STRING, !alcoholFlag, !schedulingFlag,item.getNbbm(),item.getLpName());
             }
         }
         // 更新信息
         for (Driver item : drivers) {
             // 无排班
             if (Objects.isNull(vo)) {
-                vos.add(new DriverResponseVo(null, item, null, null, false));
+                vos.add(new DriverResponseVo(null, item, null, null, false,null,null));
             } else {
                 vos.add(vo);
             }
@@ -114,7 +114,7 @@ public class SignInServiceImpl implements ISignInService {
         if (Objects.isNull(driver)) return AjaxResult.error("这个工号的员工不存在！");
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-        SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
+        SignInResponseVo vo = getSignInResponseVo(driver, signIn, equipment);
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
         // 签到检查 酒精检查 超时检查 排班检查
@@ -188,7 +188,7 @@ public class SignInServiceImpl implements ISignInService {
         if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
-        SignInResponseVo vo = getSignInResponseVo(signIn, equipment);
+        SignInResponseVo vo = getSignInResponseVo(driver,signIn, equipment);
         signIn.setCreateTime(new Date());
         signIn.setRemark("");
         GlobalIndex globalIndex = new GlobalIndex();
@@ -224,7 +224,7 @@ public class SignInServiceImpl implements ISignInService {
         return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING, vo) : AjaxResult.success(SIGN_IN_ERROR + ":" + signIn.getRemark(), vo);
     }
-    private SignInResponseVo getSignInResponseVo(SignIn signIn, Equipment equipment) {
+    private SignInResponseVo getSignInResponseVo(Driver driver, SignIn signIn, Equipment equipment) {
         SignInResponseVo vo = new SignInResponseVo(signIn);
         if (Objects.isNull(equipment)) {
             equipment = new Equipment();
@@ -232,6 +232,8 @@ public class SignInServiceImpl implements ISignInService {
         vo.setAddress(equipment.getAddress());
         vo.setDeviceId(signIn.getDeviceId());
         vo.setSiteName(equipment.getSiteName());
+        vo.setName(driver.getPersonnelName());
+        vo.setPosts(driver.getPosts());
         return vo;
     }
@@ -287,7 +289,6 @@ public class SignInServiceImpl implements ISignInService {
             case "售票员":
                 String key = ConstDateUtil.formatDate(now);
                 // 查询工号对应的排班 司售人员
-                dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
                 log.debug("签到key:{}，排班数据:{}", key, dto);
                 if (CollectionUtil.isEmpty(dto)) {
                     signIn.setRemark(signIn.getRemark() + WORK_DAY_ERROR);
@@ -364,8 +365,8 @@ public class SignInServiceImpl implements ISignInService {
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
                     }
-                    // 当前最近无记录|签到,type:签到  -> 签到超时给上
-                    else if (currentScheduling.getBcType().equals(BC_TYPE_OUT)) {
+                    // 当前最近无记录|签到,type:签到|签退  -> 签到超时给上
+                    else  {
                         signIn.setRemark(SIGN_IN_TIMEOUT);
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -374,14 +375,14 @@ public class SignInServiceImpl implements ISignInService {
                 // 签退一个逻辑 当前无记录
                 if (currentScheduling.getBcType().equals(BC_TYPE_IN) && Objects.isNull(currentScheduling.getSignInId())) {
                     DriverSignRecommendation lastClosestTimestamp = schedulingService.computedTheCurrentClosestTimestamp(dto, now, -1);
-                    // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到超时
+                    // 上一次无记|签退,type:签到  当前时间小于最近签退时间 -> 签到异常
                     if (nowBetween < -60L && Objects.isNull(lastClosestTimestamp.getSignInId()) && signIn.getType().equals(SIGN_OUT)) {
                         signIn.setRemark(SIGN_IN_TIMEOUT);
                         globalIndex.setIndex(lastClosestTimestamp.getIndex());
                         result = false;
                     }
-                    // 当前无记|签退 ， type：签退  ——> 超时签退
-                    else if (signIn.getType().equals(SIGN_OUT)) {
+                    // 当前无记|签退 ， type：签退|签到  ——> 签退异常
+                    else  {
                         signIn.setRemark(SIGN_OUT_TIMEOUT);
                         globalIndex.setIndex(currentScheduling.getIndex());
                         result = false;
@@ -213,10 +213,23 @@ public class DriverJob implements InitializingBean {
         }
         // 获取排班信息并存入redis
         saveSchedulingToRedis(getSchedulingInfoUrl, formatDate);
-
+        // 删除两天前排班信息
+        deleteScheduling();
         log.info("获取{}的排班数据完毕", formatDate);
     }
+    private void deleteScheduling() {
+        String nowKey = DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate(new Date());
+        String yesterdayKey = DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
+        List<String> keys = SCHEDULING_CACHE.getKeys();
+        for (int i = 0; i < keys.size(); i++) {
+            if (nowKey.equals(keys.get(i)) || yesterdayKey.equals(keys.get(i))){
+                continue;
+            }
+            SCHEDULING_CACHE.removeCacheSchedulingByKey(keys.get(i));
+        }
+    }
+
     /**
      * 计算是否全部设备完成了对应的用户人脸注册
      */
@@ -19,6 +19,9 @@ public class DriverSignRecommendation {
     private Long timestamps;
     private Long signInId;
     private Integer exType;
+    private String nbbm;
+    private String lpName;
+    private String lineName;
     public DriverSignRecommendation() {
     }
@@ -30,5 +33,8 @@ public class DriverSignRecommendation {
         this.setSignInId(dto.getSignInId());
         this.setPosts(dto.getPosts());
         this.setExType(dto.getExType());
+        this.setLineName(dto.getLineName());
+        this.setNbbm(dto.getNbbm());
+        this.setLpName(dto.getLpName());
     }
 }
@@ -8,5 +8,5 @@ import lombok.Data;
 @Data
 public class GlobalIndex {
     private Integer index;
-    public GlobalIndex(){this.index = -1;}
+    public GlobalIndex(){this.index = 0;}
 }
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.List;
+import javax.validation.constraints.NotBlank;
 /**
  * 接收前端查询vo
@@ -15,18 +15,24 @@ import java.util.List;
 @Data
 public class ReportViewRequestVo {
-    private List<String> ids;
     /**
      * 员工工号
      */
     @ApiModelProperty("员工工号")
+    @NotBlank
     private String jobCode;
     /**
      * 日期
      */
     @ApiModelProperty("日期")
+    @NotBlank
     private String date;
     /**
+     * 日期
+     */
+    @ApiModelProperty("日期")
+    private String lineName;
+    /**
      * 签到状态
      */
     @ApiModelProperty("签到状态")
@@ -37,7 +43,7 @@ public class ReportViewRequestVo {
     @ApiModelProperty("姓名")
     String name;
-    @ApiModelProperty("导出天还是月 1 天 2 月")
+    @ApiModelProperty("导出天还是月 0 无 1 天 2 月")
     Integer exportFlag;
 }
@@ -20,10 +20,16 @@ public class DriverResponseVo extends Driver {
     private String planAction;
     @ApiModelProperty("是否有排班(true:有,false:没有)")
     private Boolean schedulingFlag;
-    @ApiModelProperty("打卡时间")
+    @ApiModelProperty("计划打卡时间")
     private Long signTime;
+    @ApiModelProperty("车辆自编号")
+    private String nbbm;
+    @ApiModelProperty("路牌")
+    private String lpName;
-    public DriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag){
+    public DriverResponseVo(Long signTime, Driver driver,String planAction,Boolean checkAlcohol,Boolean schedulingFlag,String nbbm,String lpName){
+        this.setNbbm(nbbm);
+        this.setLpName(lpName);
         this.setSignTime(signTime);
         this.setSchedulingFlag(schedulingFlag);
         this.setCheckAlcohol(checkAlcohol);
@@ -55,8 +61,6 @@ public class DriverResponseVo extends Driver {
         this.setUpdateBy(driver.getUpdateBy());
         this.setUpdateTime(driver.getUpdateTime());
         this.setRemark(driver.getRemark());
-
-
     }
     public DriverResponseVo(){}
 }
+package com.ruoyi.pojo.response;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DriverSignInRecordResponseVo {
+    private String jobCode;
+    private String name;
+    private String posts;
+    private Date scheduleDate;
+    private String lineName;
+    private String lpName;
+    private String nbbm;
+    private String bcType;
+    private Date signInTime;
+    private Integer type;
+    private String remark;
+    private Long signInId;
+    private Integer exType;
+}
 package com.ruoyi.pojo.response;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import java.util.Date;
+
 /**
  * @author 20412
  */
 @Data
 @ApiModel("报表对象表")
 public class ExportReportViewResponseVo {
+    @ExcelProperty(value = "工号")
+    private String jobCode;
+    @ExcelProperty(value = "姓名")
+    private String name;
+    @ExcelProperty(value = "工种")
+    private String posts;
+
+    @ExcelProperty(value = "线路")
+    private String lineName;
+
+    @ApiModelProperty("车队名称")
+    @ExcelProperty(value = "车队名称")
+    private String fleetName;
+
+    @ExcelProperty(value = "车辆自编号")
+    private String nbbm;
+
+    @ExcelProperty(value = "计划签到时间")
+    private Date planSignInTime;
+    @ExcelProperty(value = "实际签到时间")
+    private Date actualSignInTime;
+    @ExcelProperty(value = "签到结果")
+    private String signInResultString;
+    @ExcelProperty(value = "计划签退时间")
+    private Date planSignOutTime;
+    @ExcelProperty(value = "实际签退时间")
+    private Date actualSignOutTime;
+    @ExcelProperty(value = "签退结果")
+    private String signOutResultString;
+
+
+    @ExcelProperty(value = "分班计划签到时间")
+    private Date secondPlanSignInTime;
+    @ExcelProperty(value = "分班实际签到时间")
+    private Date secondActualSignInTime;
+    @ExcelProperty(value = "分班签到结果")
+    private String secondSignInResultString;
+    @ExcelProperty(value = "分班计划签退时间")
+    private Date secondPlanSignOutTime;
+    @ExcelProperty(value = "分班实际签退时间")
+    private Date secondActualSignOutTime;
+    @ExcelProperty(value = "分班签退结果")
+    private String secondSignOutResultString;
+
+    @ExcelProperty(value = "排班日期")
+    private Date schedulingDate;
+
 }
+package com.ruoyi.pojo.response;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel("签到报表查看详情vo")
+public class ReportDetailResponseVo {
+}
 package com.ruoyi.pojo.response;
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.converters.string.StringImageConverter;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.pojo.converter.AlcoholFlagConverter;
-import com.ruoyi.pojo.converter.SignInConvert;
 import com.ruoyi.pojo.converter.SignInStatusConverter;
-import com.ruoyi.pojo.converter.SignInTypeConverter;
-import com.ruoyi.pojo.converter.common.ImageConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
-import java.net.URL;
 import java.util.Date;
 /**
@@ -45,6 +34,9 @@ public class ReportViewResponseVo {
     @ApiModelProperty("车辆自编号")
     private String nbbm;
+    @ApiModelProperty("车辆自编号")
+    private String lpName;
+
     private Integer planSignInCount;
     private Integer actualSignInCount;
     private Integer planSignOutCount;
@@ -52,10 +44,11 @@ public class ReportViewResponseVo {
     @ExcelProperty(value = "签到状态", converter = SignInStatusConverter.class)
     @ApiModelProperty("签到状态")
-    private Integer status;
+    private String exString;
     @ApiModelProperty("排班日期")
-    private Date schedulingDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date scheduleDate;
     @ApiModelProperty("备注")
     private String remark;
@@ -2,10 +2,12 @@ package com.ruoyi.service;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.domain.EquipmentException;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.pojo.entity.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
 import com.ruoyi.pojo.response.ReportErrorResponseVo;
@@ -14,6 +16,7 @@ import com.ruoyi.pojo.response.ReportViewResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -37,9 +40,12 @@ public class ReportService {
     @Autowired
     private DriverMapper driverMapper;
-    @Autowired
+    @Resource
     private SchedulingService schedulingService;
+    @Autowired
+    private DriverSchedulingMapper schedulingMapper;
+
     /**
      * 查询报表信息
      */
@@ -121,4 +127,9 @@ public class ReportService {
         return null;
     }
+
+    public List<DriverScheduling> getReportDetail(ReportViewRequestVo vo, HttpServletResponse response) {
+        List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
+        return null;
+    }
 }
 package com.ruoyi.service;
+import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -25,8 +26,7 @@ import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_TIMEOUT;
 import static com.ruoyi.common.ErrorTypeProperties.SIGN_OUT_TIMEOUT;
-import static com.ruoyi.common.ReportProperties.DAY;
-import static com.ruoyi.common.ReportProperties.MONTH;
+import static com.ruoyi.common.ReportProperties.NOW;
 /**
  * @author 20412
@@ -51,17 +51,15 @@ public class SchedulingService {
         // TODO 查表变成缓存查询
         List<DriverScheduling> dto = null;
         for (int i = 0; i > -2; i--) {
-            dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)), jobCode);
-            if (!Objects.isNull(dto)) {
+            dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)), null, jobCode, null);
+            if (!CollectionUtil.isEmpty(dto)) {
                 dto.sort(Comparator.comparing(DriverScheduling::getZdsjT));
                 if (i == -1) {
                     LocalDateTime zdsjT = ConstDateUtil.getLocalDateTimeByLongTime(dto.get(dto.size() - 1).getZdsjT());
                     LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
                     long range = ChronoUnit.MINUTES.between(zdsjT, nowTime);
-                    // 判定存在排班
-                    if (range <= 120L) {
-                        return dto;
-                    } else {
+                    // 判定存在排班 前天的最后一次打卡时间超过2小时，排班为null
+                    if (range > 120L) {
                         dto = null;
                     }
                 }
@@ -143,8 +141,8 @@ public class SchedulingService {
     public List<ReportViewResponseVo> queryReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
         // 处理天
-        if (requestVo.getExportFlag().equals(DAY)) {
-            return getDayReportTableResponseVo(requestVo.getDate(), response);
+        if (requestVo.getExportFlag().equals(NOW)) {
+            return getDayReportTableResponseVo(requestVo, response);
         }
 //        // 处理月
 //        else if (requestVo.getExportFlag().equals(MONTH)) {
@@ -158,9 +156,9 @@ public class SchedulingService {
         // TODO
         // 获取当月到目前为止的所有数据
         List<String> dayList = getAllDaysOfTheMonth();
-        for (String date : dayList) {
-            getDayReportTableResponseVo(date, response);
-        }
+//        for (String date : dayList) {
+//            getDayReportTableResponseVo(date, response);
+//        }
         return null;
     }
@@ -181,13 +179,13 @@ public class SchedulingService {
     }
-    private List<ReportViewResponseVo> getDayReportTableResponseVo(String date, HttpServletResponse response) {
+    private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo, HttpServletResponse response) {
         // 签到数据
-        List<DriverScheduling> toDay = schedulingMapper.queryToDay(date, null);
+        List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
         // 转换日期 + jobCode为key
         Map<String, List<DriverScheduling>> orangeMap = new HashMap<>(1200);
         for (DriverScheduling scheduling : toDay) {
-            String key = date + scheduling.getJobCode();
+            String key = vo.getDate() + scheduling.getJobCode();
             if (Objects.isNull(orangeMap.get(key))) {
                 orangeMap.put(key, new ArrayList<>(Arrays.asList(scheduling)));
             } else {
@@ -197,9 +195,9 @@ public class SchedulingService {
         Map<String, ReportViewResponseVo> resultMap = new HashMap<>(1200);
         for (String key : orangeMap.keySet()) {
             List<DriverScheduling> list = orangeMap.get(key);
-            ReportViewResponseVo vo = new ReportViewResponseVo();
-            handleScheduling(list, vo);
-            resultMap.put(key, vo);
+            ReportViewResponseVo vo1 = new ReportViewResponseVo();
+            handleScheduling(list, vo1);
+            resultMap.put(key, vo1);
         }
         return new ArrayList<>(resultMap.values());
     }
@@ -209,7 +207,6 @@ public class SchedulingService {
         int actualSignInCount = 0;
         int planSignOutCount = 0;
         int actualSignOutCount = 0;
-        Boolean exFlag = false;
         BeanUtils.copyProperties(list.get(0), vo);
         for (DriverScheduling scheduling : list) {
             // 获取计划签到|签退次数
@@ -225,8 +222,11 @@ public class SchedulingService {
                 }
             }
             // 判断是否异常
-//            if (scheduling.getSignInId())
-            exFlag = true;
+            if (!SIGN_NO_EX_NUM.equals(scheduling.getExType())) {
+                vo.setExString(HAVE_EX);
+            } else {
+                vo.setExString(NO_EX);
+            }
         }
         vo.setPlanSignInCount(planSignInCount);
         vo.setPlanSignOutCount(planSignOutCount);
@@ -253,7 +253,7 @@ public class ThreadJobService {
     @Transactional(rollbackFor = {Exception.class})
     public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap) {
         //查询当天是否保存过考情表  如果存在则保存
-        List<DriverScheduling> dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null);
+        List<DriverScheduling> dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd"), null,null,null);
         if (!CollectionUtil.isEmpty(dto) || originSchedulingMap.size() == 0) {
 //            log.info("今天已获取过考勤数据");
             return;
@@ -43,19 +43,24 @@
         job_code = values(job_code)
     </insert>
     <update id="updateRoster">
-        update scheduling set sign_in_id = #{signInId}
+        update scheduling
+        set sign_in_id = #{signInId},
+            ex_type    = #{exType}
         where id = #{scheduling.id}
     </update>
     <select id="queryToDay" resultType="com.ruoyi.pojo.entity.DriverScheduling" resultMap="Scheduling">
         select * from
-                      scheduling
+        scheduling
         where schedule_date = #{date}
         <if test="jobCode !=null and jobCode != ''">
             and job_code = #{jobCode}
         </if>
-        <if test="jobCode ==null or jobCode == ''">
-            limit 1
+        <if test="name !=null and name != ''">
+            and `name` = #{name}
+        </if>
+        <if test="lineName !=null and lineName != ''">
+            and line_name = #{lineName}
         </if>
     </select>