From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java b/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java
index 6e99550..53b49f9 100644
--- a/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java
@@ -78,7 +78,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);
@@ -91,7 +91,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