From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
index cedcdb4..54e282e 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
@@ -163,7 +163,7 @@
AttendanceClassesTaskDto tmpAttendanceClassesTaskDto = new AttendanceClassesTaskDto();
tmpAttendanceClassesTaskDto.setClassId(reqJson.getString("classesId"));
tmpAttendanceClassesTaskDto.setTaskYear(reqJson.getString("taskYear"));
- tmpAttendanceClassesTaskDto.setTaskDay(reqJson.getString("taskDay"));
+ tmpAttendanceClassesTaskDto.setTaskMonth(reqJson.getString("taskMonth"));
tmpAttendanceClassesTaskDto.setStaffIds(staffIds.toArray(new String[staffIds.size()]));
List<AttendanceClassesTaskDetailDto> attendanceClassesTaskDetailDtos = reportAttendanceInnerServiceSMOImpl.getMonthAttendanceDetail(tmpAttendanceClassesTaskDto);
@@ -176,7 +176,11 @@
attendanceClassesTaskDto.setDays(days);
}
for (AttendanceClassesTaskDetailDto tmpAttendanceClassesTaskDetailDto : attendanceClassesTaskDetailDtos) {
- if (days.containsKey(tmpAttendanceClassesTaskDetailDto.getTaskDay())) {
+ if(!attendanceClassesTaskDto.getStaffId().equals(tmpAttendanceClassesTaskDetailDto.getStaffId())){
+ continue;
+ }
+ if (days.containsKey(tmpAttendanceClassesTaskDetailDto.getTaskDay())
+ ) {
tAttendanceClassesTaskDetailDto = (List<AttendanceClassesTaskDetailDto>) days.get(tmpAttendanceClassesTaskDetailDto.getTaskDay());
tAttendanceClassesTaskDetailDto.add(tmpAttendanceClassesTaskDetailDto);
} else {
--
Gitblit v1.8.0