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