From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..5f30875 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
@@ -5,8 +5,8 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.attendanceClasses.AttendanceClassesTaskDetailDto;
-import com.java110.dto.attendanceClasses.AttendanceClassesTaskDto;
+import com.java110.dto.attendance.AttendanceClassesTaskDetailDto;
+import com.java110.dto.attendance.AttendanceClassesTaskDto;
import com.java110.intf.report.IReportAttendanceInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -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