feat: 针对报表数据做修改。

guzijian
1 parent f84a8a36
Showing 5 changed files with 85 additions and 19 deletions
Bsth-admin/src/main/java/com/ruoyi/common/SignStatusEnum.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.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/ToolUtils.java
 package com.ruoyi.common;
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+
 /**
- * 签到状态枚举
+ * 签到状态枚举 大屏
+ *
  * @author 20412
  */
 public enum SignStatusEnum {
-    SIGN_STATUS_ZONE_ENUM(0,"今日签到正常"),
-    SIGN_STATUS_EMPTY_ENUM(1,"今日打卡未签"),
-    SIGN_STATUS_DELAY_ENUM(2,"今日签到迟到"),
-    SIGN_STATUS_WINE_ENUM(3,"今日酒测异常");
+    SIGN_STATUS_ZONE_ENUM(0, "正常"),
+    SIGN_STATUS_EMPTY_ENUM(1, "未签"),
+    SIGN_STATUS_DELAY_ENUM(2, ""),
+    SIGN_STATUS_WINE_ENUM(3, "酒精测试超标");
-    SignStatusEnum(Integer status,String description){
+    SignStatusEnum(Integer status, String description) {
         this.status = status;
         this.description = description;
     }
+
     private String description;
     private Integer status;
     public Integer getStatus() {
-        return status;
+        return this.status;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public String getDescription(String bcType) {
+        if (BC_TYPE_OUT.equals(bcType)) {
+            return "迟到";
+        } else {
+            return "晚签";
+        }
     }
 }
@@ -641,7 +641,7 @@ public class SignInServiceImpl implements ISignInService {
         LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
         long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
         globalIndex.setIndex(0);
-        // 单挑数据 且不在范围内
+        // 单条数据 且不在范围内
         if (BC_TYPE_IN.equals(dto.get(0).getBcType())) {
             if (!(Math.abs(nowBetween) <= 60)) {
                 signIn.setRemark(SIGN_OUT_TIMEOUT);
@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.eexception.mapper.EquipmentExceptionMapper;
@@ -17,6 +16,7 @@ import com.ruoyi.pojo.vo.PersonSignDataResponseVo;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ToolUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -190,23 +190,26 @@ public class ReportService {
     }
     private void handlerResultMap(@NotBlank String date, Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
-        for (DriverScheduling item : schedulingList) {
-            String key = date + item.getJobCode();
+        for (DriverScheduling scheduling : schedulingList) {
+            String key = date + scheduling.getJobCode();
+            // TODO 特殊处理
+            ToolUtils.updateReport(scheduling);
             if (Objects.isNull(resultMap.get(key))) {
-                resultMap.put(key, new ArrayList<>(Arrays.asList(item)));
+                resultMap.put(key, new ArrayList<>(Arrays.asList(scheduling)));
             } else {
-                resultMap.get(key).add(item);
+                resultMap.get(key).add(scheduling);
             }
         }
     }
     private void handlerResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
-        for (DriverScheduling item : schedulingList) {
-            String key = item.getScheduleDate() + item.getJobCode();
+        for (DriverScheduling scheduling : schedulingList) {
+            String key = scheduling.getScheduleDate() + scheduling.getJobCode();
+            ToolUtils.updateReport(scheduling);
             if (Objects.isNull(resultMap.get(key))) {
-                resultMap.put(key, new ArrayList<>(Arrays.asList(item)));
+                resultMap.put(key, new ArrayList<>(Arrays.asList(scheduling)));
             } else {
-                resultMap.get(key).add(item);
+                resultMap.get(key).add(scheduling);
             }
         }
     }
@@ -247,6 +250,7 @@ public class ReportService {
         List<ReportDetailResponseVo> responseVos = new ArrayList<>();
         List<DriverScheduling> toDay = schedulingMapper.queryToDay(vo.getDate(), vo.getName(), vo.getJobCode(), vo.getLineName());
         for (DriverScheduling scheduling : toDay) {
+            ToolUtils.updateReport(scheduling);
             ReportDetailResponseVo reportDetailResponseVo = new ReportDetailResponseVo();
             handlerReportDetail(reportDetailResponseVo, scheduling);
             responseVos.add(reportDetailResponseVo);
@@ -3,7 +3,6 @@ package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
@@ -13,6 +12,7 @@ import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ToolUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +30,7 @@ import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
 import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.ReportProperties.NOW;
+import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_DELAY_ENUM;
 /**
  * @author 20412
@@ -148,7 +149,7 @@ public class SchedulingService {
             if (nowBetween < -60L) {
                 sb.append(EARLY);
             } else {
-                sb.append(DELAY);
+                sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
             }
             // 在规定时间就还原remark
         } else {
@@ -276,6 +277,7 @@ public class SchedulingService {
         for (DriverScheduling scheduling : toDay) {
             String key = vo.getDate() + scheduling.getJobCode();
             if (Objects.isNull(orangeMap.get(key))) {
+                ToolUtils.updateReport(scheduling);
                 orangeMap.put(key, new ArrayList<>(Arrays.asList(scheduling)));
             } else {
                 orangeMap.get(key).add(scheduling);
 package com.ruoyi.utils;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.pojo.dto.RuleSchedulingDto;
 import com.ruoyi.scheduling.domain.RuleScheduling;
 import org.springframework.beans.BeanUtils;
+import java.util.Date;
+import java.util.Objects;
+
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
+import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_OUT;
+import static com.ruoyi.common.ConstSignInConstSignInProperties.SIGN_TIME_OUT_EX_NUM;
 import static com.ruoyi.common.RuleSchedulingProperties.TOMORROW_NO;
+import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_DELAY_ENUM;
+import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_ZONE_ENUM;
 public class ToolUtils {
@@ -29,4 +38,39 @@ public class ToolUtils {
             BeanUtils.copyProperties(dto, main);
         }
     }
+
+    /**
+     * 更新报表记录
+     * @param scheduling
+     */
+    public static void updateReport(DriverScheduling scheduling) {
+        // TODO UPDATE 这里是特殊处理 青浦后续修改了签到规则
+        // 原先正负一小时内  修改为计划签到前一小时内超过就迟到，业主很急就不修改签到规则改为直接修改报表数据
+        // 签到
+        if (BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getSignTime()) && SIGN_STATUS_ZONE_ENUM.getStatus().equals(scheduling.getExType())) {
+            // 实际签到时间
+            Date date = scheduling.getSignTime();
+            // 计划签到时间
+            Long fcsjT = scheduling.getFcsjT();
+            if (date.getTime() > fcsjT) {
+                scheduling.setExType(SIGN_TIME_OUT_EX_NUM);
+                scheduling.setRemark(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
+            }
+        }
+        // 签退客户说把时间约定在正负一小时以内
+        // 签退
+        if (BC_TYPE_IN.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getSignTime()) && SIGN_STATUS_ZONE_ENUM.getStatus().equals(scheduling.getExType())) {
+            // 实际签退时间
+            Date date = scheduling.getSignTime();
+            // 计划签退时间
+            Long zdsjT = scheduling.getZdsjT();
+            // 一小时内约束
+            if ( date.getTime() - zdsjT > 60 * 60 * 1000 ) {
+                scheduling.setExType(SIGN_TIME_OUT_EX_NUM);
+                scheduling.setRemark(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
+            }
+        }
+    }
+
+
 }