Browse Source

日志修复离/入职过滤不生效的问题

xjj 1 năm trước cách đây
mục cha
commit
af103f6575

+ 1 - 0
src/pages/ReportDaily/components/ReportTable.js

@@ -6,6 +6,7 @@ const ReportTable = ({ data, month }) => {
   // 将 data 对象解析为表格的 dataSource
   const dataSource = useMemo(() => {
     if (!data) return [];
+    // return data
     return data.filter(
       item => item.unsubmittedReports.length > 0 || item.lateSubmissions.length > 0
     );

+ 4 - 3
src/pages/ReportDaily/utils.js

@@ -15,7 +15,7 @@ async function getLateSubmissionsAndUnsubmittedReports(option) {
   // 遍历报表数据,生成以工号为键、提交时间数组为值的数据结构
   reportData.forEach(item => {
     const employeeId = item.creator_id;
-    // if (employeeId != "16015142307766361") return;
+    // if (item.creator_name != '徐俊杰') return;
     const reportTime = moment(item.create_time, 'YYYY年MM月DD日 HH:mm');
     if (!employeeSubmissions[employeeId]) {
       employeeSubmissions[employeeId] = {
@@ -133,6 +133,7 @@ async function filterByResignationDate(employeeData) {
   // 获取未提交列表
   let data = employeeData.filter(item => item.unsubmittedReports.length > 0);
   let userIds = data.map(item => item.userId);
+  if (userIds.length == 0) return;
   // 根据未提交人的id查询离职情况
   const dimissionInfos = await getResignationDate(userIds);
   for (let i = 0; i < data.length; i++) {
@@ -162,8 +163,8 @@ export async function getData(startTime, endTime, onProcess) {
   });
 
   // 判断员工入职时间和离职时间
-  filterByHireDate(employeeData, onProcess);
-  filterByResignationDate(employeeData, onProcess);
+  await filterByHireDate(employeeData, onProcess);
+  await filterByResignationDate(employeeData, onProcess);
 
   return employeeData;
 }