增加2024年放假日历

给任务列表接口增加默认页码

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -917,7 +917,7 @@ public class TaskController {
      * @return
      */
     @RequestMapping("/listByPage")
-    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize,Integer type,Integer dateType,String startDate,String endDate,Integer deptId) {
+    public HttpRespMsg listByPage(Integer status, Integer viewId, @RequestParam(required = false, defaultValue = "1") Integer pageIndex, Integer pageSize,Integer type,Integer dateType,String startDate,String endDate,Integer deptId) {
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         User user = userMapper.selectById(userId);
@@ -962,9 +962,15 @@ public class TaskController {
         List<Integer> collect = list.stream().map(l -> l.getId()).distinct().collect(Collectors.toList());
         collect.add(-1);
         List<TaskExecutor> taskExecutorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().in("task_id", collect));
+        List<Integer> pids = list.stream().map(Task::getProjectId).collect(Collectors.toList());
+        List<Project> projectList = projectService.list(new QueryWrapper<Project>().in("id", pids));
         list.forEach(l->{
             List<TaskExecutor> executorList = taskExecutorList.stream().filter(tl -> tl.getTaskId().equals(l.getId())&&tl.getExecutorId()!=null).collect(Collectors.toList());
             l.setExecutorList(executorList);
+            Optional<Project> first = projectList.stream().filter(p -> p.getId().equals(l.getProjectId())).findFirst();
+            if (first.isPresent()) {
+                l.setProjectInchargerId(first.get().getInchargerId());
+            }
         });
         int total = taskMapper.selectCount(queryWrapper);
         Map<String, Object> map = new HashMap<>();

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/WorkDayCalculateUtils.java

@@ -75,21 +75,6 @@ public class WorkDayCalculateUtils {
         });
         YEAR_DEFINE.put("2022", map2022);
 
-//        HashMap<String, String[]> map2023 = new HashMap<>();
-//        //除了周末的特殊工作日
-//        map2023.put(KEY_SPECIAL_WORK_DAYS, new String[]{"2022-01-29","2022-01-30","2022-04-02","2022-04-24","2022-05-07","2022-10-08","2022-10-09",});
-//        //除了周末的特殊休息日，例如国庆中秋春节
-//        map2023.put(KEY_SPECIAL_REST_DAYS, new String[]{
-//                "2022-01-03",//元旦
-//                "2022-01-31", "2022-02-01", "2022-02-02", "2022-02-03", "2022-02-04",//春节
-//                "2022-04-04","2022-04-05",//清明节
-//                "2022-05-02","2022-05-03","2022-05-04",//劳动节
-//                "2022-06-03",//端午节
-//                "2022-09-20","2022-09-21",//中秋节
-//                "2022-10-01", "2022-10-02","2022-10-03","2022-10-04","2022-10-05","2022-10-06","2022-10-07",//国庆节
-//        });
-//        YEAR_DEFINE.put("2023", map2023);
-
         HashMap<String, String[]> map2023 = new HashMap<>();
         //除了周末的特殊工作日
         map2023.put(KEY_SPECIAL_WORK_DAYS, new String[]{"2023-01-28","2023-01-29","2023-04-23","2023-05-06","2023-06-25","2023-10-07","2023-10-08",});
@@ -104,6 +89,26 @@ public class WorkDayCalculateUtils {
         });
         YEAR_DEFINE.put("2023", map2023);
 
+        HashMap<String, String[]> map2024 = new HashMap<>();
+        //除了周末的特殊工作日
+        map2024.put(KEY_SPECIAL_WORK_DAYS, new String[]{"2024-02-04",//春节
+                "2024-02-18",//春节
+                "2024-04-07",//清明节
+                "2024-04-28","2024-05-11",//劳动节
+                "2024-09-14",//中秋节
+                "2024-09-29","2024-10-12",//国庆节
+                });
+        //除了周末的特殊休息日，例如国庆中秋春节
+        map2024.put(KEY_SPECIAL_REST_DAYS, new String[]{
+                "2024-01-01",//元旦
+                "2024-02-12", "2024-02-13", "2024-02-14", "2024-02-15", "2024-02-16",//春节
+                "2024-04-04","2024-04-05",//清明节
+                "2024-05-01","2024-05-02","2024-05-03",//劳动节
+                "2024-06-10",//端午节
+                "2024-09-16","2024-09-17",//中秋节
+                "2024-10-01","2024-10-02","2024-10-03","2024-10-04","2024-10-07",//国庆节
+        });
+        YEAR_DEFINE.put("2024", map2024);
     }
 
     /**