feat: 新增签到查询过滤

guzijian
1 parent cc8441d5
Showing 2 changed files with 49 additions and 10 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/ReportViewRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
@@ -46,4 +46,7 @@ public class ReportViewRequestVo {
     @ApiModelProperty("导出天还是月 0 无 1 天 2 月")
     Integer exportFlag;
+    @ApiModelProperty("查询各个阶段超时的人员 0 全部 1 第一次打卡 2 第二卡打卡 3 第三次打卡 4 第四次打卡")
+    Integer stage;
+
 }
@@ -57,7 +57,7 @@ public class SchedulingService {
         List<DriverScheduling> dto = null;
         for (int i = 0; i > -2; i--) {
-            dto = nowSchedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)),jobCode);
+            dto = nowSchedulingCache.getCacheSchedulingMapValueByHKey(ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i)), jobCode);
             if (!CollectionUtil.isEmpty(dto)) {
                 dto.sort(Comparator.comparing(DriverScheduling::getZdsjT));
                 if (i == -1) {
@@ -168,7 +168,6 @@ public class SchedulingService {
     }
     private List<ReportViewResponseVo> getMonthReportTableResponseVo(ReportViewRequestVo requestVo, HttpServletResponse response) {
-        // TODO
         // 获取当月到目前为止的所有数据
         List<String> dayList = getAllDaysOfTheMonth();
 //        for (String date : dayList) {
@@ -197,8 +196,25 @@ public class SchedulingService {
     private List<ReportViewResponseVo> getDayReportTableResponseVo(ReportViewRequestVo vo, HttpServletResponse response) {
         // 签到数据
         List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
+        toDay.sort(Comparator.comparing(DriverScheduling::getFcsjT));
         // 转换日期 + jobCode为key
         Map<String, List<DriverScheduling>> orangeMap = new HashMap<>(1200);
+        transformMapByDriverScheduling(vo, toDay, orangeMap);
+        Map<String, ReportViewResponseVo> resultMap = new HashMap<>(1200);
+        for (String key : orangeMap.keySet()) {
+            List<DriverScheduling> list = orangeMap.get(key);
+            // 过滤 vo
+            if (filterReportVoList(vo.getStage(), list)) {
+                continue;
+            }
+            ReportViewResponseVo vo1 = new ReportViewResponseVo();
+            handlerScheduling(list, vo1);
+            resultMap.put(key, vo1);
+        }
+        return new ArrayList<>(resultMap.values());
+    }
+
+    private static void transformMapByDriverScheduling(ReportViewRequestVo vo, List<DriverScheduling> toDay, Map<String, List<DriverScheduling>> orangeMap) {
         for (DriverScheduling scheduling : toDay) {
             String key = vo.getDate() + scheduling.getJobCode();
             if (Objects.isNull(orangeMap.get(key))) {
@@ -207,14 +223,34 @@ public class SchedulingService {
                 orangeMap.get(key).add(scheduling);
             }
         }
-        Map<String, ReportViewResponseVo> resultMap = new HashMap<>(1200);
-        for (String key : orangeMap.keySet()) {
-            List<DriverScheduling> list = orangeMap.get(key);
-            ReportViewResponseVo vo1 = new ReportViewResponseVo();
-            handlerScheduling(list, vo1);
-            resultMap.put(key, vo1);
+    }
+
+    private boolean filterReportVoList(Integer stage, List<DriverScheduling> list) {
+        if (!stage.equals(0)) {
+            return handleReportScrollViewTable(stage, list);
         }
-        return new ArrayList<>(resultMap.values());
+        return false;
+    }
+
+    private boolean handleReportScrollViewTable(Integer stage, List<DriverScheduling> list) {
+        if (list.size() < stage) {
+            return true;
+        }
+
+        if (Objects.isNull(list.get(stage - 1).getSignTime())) {
+            return false;
+        }
+
+        DriverScheduling scheduling = list.get(stage - 1);
+        // 获取两个 Date 对象之间的时间差（以毫秒为单位）
+        long timeDifferenceInMillis = scheduling.getSignTime().getTime() - (scheduling.getBcType().equals(BC_TYPE_OUT) ? scheduling.getFcsjT() : scheduling.getZdsjT());
+        // 相差十五分钟
+        if (timeDifferenceInMillis > 0 && timeDifferenceInMillis < (60 * 1000 * 15)) {
+            return true;
+        } else if (timeDifferenceInMillis < 0) {
+            return true;
+        }
+        return false;
     }
     private static void handlerScheduling(List<DriverScheduling> list, ReportViewResponseVo vo) {
@@ -252,6 +288,6 @@ public class SchedulingService {
     }
     public List<DriverScheduling> queryToDay(String date) {
-        return schedulingMapper.queryToDay(date,null,null,null);
+        return schedulingMapper.queryToDay(date, null, null, null);
     }
 }