Commit 8898de3e authored by 赵啸非's avatar 赵啸非

修改用户等

parent d56c35d6
...@@ -118,7 +118,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -118,7 +118,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery(); AttendanceRecordHikQuery hikQuery = new AttendanceRecordHikQuery();
hikQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr()); hikQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
hikQuery.setAttendanceDateEnd(DateUtil.today()); hikQuery.setAttendanceDateEnd(DateUtil.today());
hikQuery.setStaffId(entity.getId()); hikQuery.setWorkNum(entity.getWorkNum());
//出勤天数 //出勤天数
Map<String, List<AttendanceRecordHikEntity>> collect = recordHikService.find(hikQuery, context).stream().collect(Collectors.groupingBy(x -> DateUtil.formatDate(x.getAttendanceDate()))); Map<String, List<AttendanceRecordHikEntity>> collect = recordHikService.find(hikQuery, context).stream().collect(Collectors.groupingBy(x -> DateUtil.formatDate(x.getAttendanceDate())));
...@@ -128,7 +128,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -128,7 +128,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
AttendanceRecordQuery attendanceRecordQuery = new AttendanceRecordQuery(); AttendanceRecordQuery attendanceRecordQuery = new AttendanceRecordQuery();
attendanceRecordQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr()); attendanceRecordQuery.setAttendanceDateStart(DateUtil.beginOfMonth(new Date()).toDateStr());
attendanceRecordQuery.setAttendanceDateEnd(DateUtil.today()); attendanceRecordQuery.setAttendanceDateEnd(DateUtil.today());
attendanceRecordQuery.setStaffId(entity.getId()); attendanceRecordQuery.setWorkNum(entity.getWorkNum());
List<AttendanceRecordEntity> attendanceRecordEntities = recordService.find(attendanceRecordQuery); List<AttendanceRecordEntity> attendanceRecordEntities = recordService.find(attendanceRecordQuery);
...@@ -175,7 +175,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ ...@@ -175,7 +175,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
vo.setWorkFormalDay(entity.getRegularDate()); vo.setWorkFormalDay(entity.getRegularDate());
vo.setAttendanceCount(attendDays); vo.setAttendanceCount(attendDays);
vo.setLeaveCount(levealPersonNum); vo.setLeaveCount(levealPersonNum);
vo.setLateCount(beLate); vo.setLateCount(beLate+leaveEarly);
vo.setMinerCount(0L); vo.setMinerCount(0L);
vo.setLackCardCount(lackOfCards); vo.setLackCardCount(lackOfCards);
vo.setWorkOverDay(0L); vo.setWorkOverDay(0L);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment