月考勤数据查询接口修改bug

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/AttendanceReportServiceImpl.java

@@ -43,11 +43,12 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
        try {
            attendanceReport = attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(params,pageNumber,pageSize)));
            List<Map<String, Object>> dailyAttendanceList = attendanceReport.getData().getData();
            Map<String, Object> dailyAttendanceMap = dailyAttendanceList.get(0);
            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
            Map<String, String> paramap= new HashMap<>();
            paramap.put("beginDay",formatter.format((Date) dailyAttendanceMap.get("beginDay")));
            paramap.put("endDay",formatter.format((Date) dailyAttendanceMap.get("endDay")));
            if(dailyAttendanceList != null && dailyAttendanceList.size() != 0){
                Map<String, Object> dailyAttendanceMap = dailyAttendanceList.get(0);
                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
                Map<String, String> paramap= new HashMap<>();
                paramap.put("beginDay",formatter.format((Date) dailyAttendanceMap.get("beginDay")));
                paramap.put("endDay",formatter.format((Date) dailyAttendanceMap.get("endDay")));
           /* for(Map<String, Object> dailyAttendance:dailyAttendanceList ){
                dailyAttendance.put("beginDay",paramap.get("beginDay"));
@@ -59,16 +60,17 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                });
            }*/
           dailyAttendanceList.forEach((dailyAttendance)-> {
                dailyAttendanceList.forEach((dailyAttendance)-> {
                dailyAttendance.put("beginDay",paramap.get("beginDay"));
                dailyAttendance.put("endDay",paramap.get("endDay"));
                mainjobpositionList.forEach((mainjobposition) -> {
                    if (mainjobposition.getCode().equals(dailyAttendance.get("mainJobPositionId"))) {
                        dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                    }
                    dailyAttendance.put("beginDay",paramap.get("beginDay"));
                    dailyAttendance.put("endDay",paramap.get("endDay"));
                    mainjobpositionList.forEach((mainjobposition) -> {
                        if (mainjobposition.getCode().equals(dailyAttendance.get("mainJobPositionId"))) {
                            dailyAttendance.put("mainJobPositionId", mainjobposition.getValue());
                        }
                    });
                });
            });
            }
        } catch (ParseException e) {
            e.printStackTrace();
        }
@@ -183,12 +185,12 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
                CommonResponse<HashMap<String, Object>> ok1 = CommonResponse.ok(attendanceReportMap);
                return ok1;
            }
           
        } catch (ParseException e) {
            e.printStackTrace();
        }
        
        return attendanceReportResponse;
    }
@@ -271,4 +273,4 @@ public class AttendanceReportServiceImpl implements AttendanceReportService {
        });
        return attendanceReport;
    }
}
}