feat: 补签优化，之前限定时间是两天内现在限定补签为当月内

guzijian
1 parent 8add210f
Showing 3 changed files with 25 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/test/com.ruoyi/Demo.java
@@ -42,7 +42,7 @@ public class SchedulingCache {
  
     public SchedulingCache() {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
-        schedulingInit();
+//        schedulingInit();
     }
  
  
@@ -267,7 +267,12 @@ public class SignInServiceImpl implements ISignInService {
         if (Objects.isNull(driver)) return AjaxResult.warn("这个工号的员工不存在！");
         GlobalIndex globalIndex = new GlobalIndex();
         long now = signIn.getCreateTime().getTime();
-        List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
+//        List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
+        // 只能补签当月
+        if (checkSupplementarySignatureTime(signIn.getCreateTime())) {
+            throw new RuntimeException("只能对当前月的数据进行补签！");
+        }
+        List<DriverScheduling> dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd",signIn.getCreateTime()),null,driver.getJobCode(),null);
         handleSignBody(signIn, driver, globalIndex, now, dto);
         signIn.setUpdateBy(SecurityUtils.getUsername());
         signIn.setRemark("补签");
@@ -285,6 +290,15 @@ public class SignInServiceImpl implements ISignInService {
         return AjaxResult.success("补签成功");
     }
  
+    private boolean checkSupplementarySignatureTime(Date createTime) {
+        String date = ConstDateUtil.formatDate("yyyy-MM", createTime);
+        String now = ConstDateUtil.formatDate("yyyy-MM", new Date());
+        if (date.equals(now)){
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public List<SignInResponseVo> selectSignInByIds(List<Long> collect) {
         if (CollectionUtil.isEmpty(collect)) {
 package com.ruoyi;
  
+import com.ruoyi.driver.domain.Driver;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
  
 public class Demo {
     public static void main(String[] args) {
-        List<String> list = new ArrayList<>(Arrays.asList("123","2314"));
-        list.stream().filter(item->item.equals("123")).forEach(System.out::println);
+//        List<String> list = new ArrayList<>(Arrays.asList("123","2314"));
+//        list.stream().filter(item->item.equals("123")).forEach(System.out::println);
+        List<Driver> list = new ArrayList<>();
+        Map<String, Driver> collect = list.stream().collect(Collectors.toMap(Driver::getJobCode, driver -> driver));
+        System.out.println(collect);
     }
 }