修复日志只查询2023年的节假日

src/services/ReportDaily.js

@@ -1,3 +1,4 @@
+import request from '@/utils/request';
 import axios from 'axios';
 const moment = require('moment');
 
@@ -70,6 +71,23 @@ export async function getUserTakingLeave(startDate, endDate, userid) {
 
   return takingLeave;
 }
+
+/**
+ * 根据用户和时间段查询人日系统中日志提交情况
+ */
+export async function getWorkloadSubmissions(startDate, endDate, userId) {
+  const dates = [];
+  try {
+    const { data } = request(
+      `/api/v1/workload/ding?s_time=${startDate}&e_time=${endDate}&userId=${userId}`
+    );
+    dates = data.map(item => moment(item.c_time, 'YYYY年MM月DD日 HH:mm'));
+  } catch (err) {
+    console.error(err);
+  }
+  return dates;
+}
+
 /**
  * 根据用户和时间段查询请假详情
  * @param {moment} startDate
@@ -139,7 +157,6 @@ export async function getUserTakingDetail(startDate, endDate, userid) {
   do {
     res = await getDataByPage(res ? (count - 1) * size : 0);
     res.leave_status.forEach(item => {
-      
       let days = getDaysInRange(item.start_time, item.end_time);
       Object.assign(leave_status, days);
     });
@@ -211,12 +228,13 @@ export async function getAllReport(startDate, endDate, onProcess) {
 
 // 查询节假日
 export async function getHoliday(onProcess) {
+  let year = moment().year();
   let res,
     days = {
-      "2023-07-07": 1
+      '2023-07-07': 1,
     };
   res = await axios.get(
-    'https://www.mxnzp.com/api/holiday/list/year/2023?ignoreHoliday=false&app_id=kf6mqlkirgupfcok&app_secret=MDRIVy83WTN4Q0lEaUZVMEFGejFWdz09'
+    `https://www.mxnzp.com/api/holiday/list/year/${year}?ignoreHoliday=false&app_id=kf6mqlkirgupfcok&app_secret=MDRIVy83WTN4Q0lEaUZVMEFGejFWdz09`
   );
   console.log(res);
   res.data.data.forEach(month => {