Przeglądaj źródła

考勤日报修改

wangchao 4 lat temu
rodzic
commit
4b764f5be2

+ 3 - 0
location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/AttendanceManageServiceImpl.java

44
                    paramMap.put("workDay", data.get("currentDate"));
44
                    paramMap.put("workDay", data.get("currentDate"));
45
                    paramMap.put("nameAsLike", data.get("userName"));
45
                    paramMap.put("nameAsLike", data.get("userName"));
46
                    paramMap.put("orgId", data.get("orgId"));
46
                    paramMap.put("orgId", data.get("orgId"));
47
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
47
                    //查询日考勤
48
                    //查询日考勤
48
                    attendanceReport = attendanceStatusQuery.queryDailyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
49
                    attendanceReport = attendanceStatusQuery.queryDailyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
49
50
52
                    paramMap.put("endTime", data.get("currentDate"));
53
                    paramMap.put("endTime", data.get("currentDate"));
53
                    paramMap.put("nameAsLike", data.get("userName"));
54
                    paramMap.put("nameAsLike", data.get("userName"));
54
                    paramMap.put("orgId", data.get("orgId"));
55
                    paramMap.put("orgId", data.get("orgId"));
56
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
55
                    //查询周考勤
57
                    //查询周考勤
56
                    attendanceReport = attendanceStatusQuery.queryCustomAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
58
                    attendanceReport = attendanceStatusQuery.queryCustomAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
57
59
59
                    paramMap.put("month", data.get("currentDate"));
61
                    paramMap.put("month", data.get("currentDate"));
60
                    paramMap.put("nameAsLike", data.get("userName"));
62
                    paramMap.put("nameAsLike", data.get("userName"));
61
                    paramMap.put("orgId", data.get("orgId"));
63
                    paramMap.put("orgId", data.get("orgId"));
64
                    paramMap.put("attendanceStatusType","'NOR','LAT'");
62
                    //查询月考勤
65
                    //查询月考勤
63
                    attendanceReport= attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
66
                    attendanceReport= attendanceStatusQuery.queryMonthlyAttendanceReport((new CommonRequest<>(paramMap,conditionMap.getPageNumber(),conditionMap.getPageSize())));
64
                }
67
                }