optimize attendance month

java110-db/src/main/resources/mapper/report/ReportAttendanceServiceDaoImplMapper.xml

@@ -171,7 +171,8 @@
     </select>
 
     <select id="getMonthAttendanceDetail" parameterType="Map" resultType="Map">
-        select t.detail_id detailId,t.spec_cd specCd,t.`value`,t.check_time checkTime,t.state,t.face_path facePath,t.create_time createTime,act.task_day  taskDay,td.`name` stateName
+        select t.detail_id detailId,t.spec_cd specCd,t.`value`,t.check_time checkTime,t.state,t.face_path facePath,t.create_time createTime,act.task_day  taskDay,
+        td.`name` stateName,act.staff_id staffId
         from attendance_classes_task_detail t
         left join attendance_classes_task act on t.task_id = act.task_id and act.status_cd = '0'
         left join t_dict td on t.state = td.status_cd and td.table_name = 'attendance_classes_task_detail' and td.table_columns = 'state'

service-common/src/main/java/com/java110/common/cmd/attendanceClasses/GetMonthAttendanceCmd.java

@@ -78,7 +78,7 @@ public class GetMonthAttendanceCmd extends Cmd {
         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 @@ public class GetMonthAttendanceCmd extends Cmd {
                 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 {