|
@@ -3045,17 +3045,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
if (list.size() > 0) {
|
|
if (list.size() > 0) {
|
|
//存在查看权限的部门
|
|
//存在查看权限的部门
|
|
//获取公司全部人员; 按照人员状态,如果是已经离职的,当前日期在离职日期以后的,不需要显示该人员
|
|
//获取公司全部人员; 按照人员状态,如果是已经离职的,当前日期在离职日期以后的,不需要显示该人员
|
|
-
|
|
|
|
QueryWrapper<User> queryWrapper = new QueryWrapper<User>().eq("company_id", companyId);
|
|
QueryWrapper<User> queryWrapper = new QueryWrapper<User>().eq("company_id", companyId);
|
|
queryWrapper.and(wrapper->wrapper.eq("is_active", 1).eq("report_status",0)
|
|
queryWrapper.and(wrapper->wrapper.eq("is_active", 1).eq("report_status",0)
|
|
.or(wrapper2->wrapper2.eq("is_active", 0).gt("inactive_date", date)));
|
|
.or(wrapper2->wrapper2.eq("is_active", 0).gt("inactive_date", date)));
|
|
List<User> userList = userMapper.selectList(queryWrapper);
|
|
List<User> userList = userMapper.selectList(queryWrapper);
|
|
long t3 = System.currentTimeMillis();
|
|
long t3 = System.currentTimeMillis();
|
|
- System.out.println("获取人员列表耗时:" + (t3 - t2) + "ms");
|
|
|
|
List<LeaveSheet> leaveSheetList = leaveSheetMapper.selectList(
|
|
List<LeaveSheet> leaveSheetList = leaveSheetMapper.selectList(
|
|
new QueryWrapper<LeaveSheet>().select("id, owner_id, start_date, end_date, leave_type, time_type, time_days, time_hours").eq("company_id", companyId));
|
|
new QueryWrapper<LeaveSheet>().select("id, owner_id, start_date, end_date, leave_type, time_type, time_days, time_hours").eq("company_id", companyId));
|
|
long t4 = System.currentTimeMillis();
|
|
long t4 = System.currentTimeMillis();
|
|
- System.out.println("获取人员请假列表耗时:" + (t4 - t3) + "ms");
|
|
|
|
LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
List<HashMap> userMapList = new ArrayList<>();
|
|
List<HashMap> userMapList = new ArrayList<>();
|
|
LocalDate curDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
LocalDate curDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
@@ -3063,7 +3060,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
//获取当日已填写的人员报告
|
|
//获取当日已填写的人员报告
|
|
List<Map<String, Object>> reportNameByDate = reportMapper.getReportNameByDate(date, companyId, null);
|
|
List<Map<String, Object>> reportNameByDate = reportMapper.getReportNameByDate(date, companyId, null);
|
|
long t5 = System.currentTimeMillis();
|
|
long t5 = System.currentTimeMillis();
|
|
- System.out.println("获取当日已填写的人员报告耗时:" + (t5 - t4) + "ms");
|
|
|
|
Company company = companyMapper.selectById(companyId);
|
|
Company company = companyMapper.selectById(companyId);
|
|
TimeType timeType = timeTypeMapper.selectById(companyId);
|
|
TimeType timeType = timeTypeMapper.selectById(companyId);
|
|
//如果没有开通OA模块,有开通企业微信同步考勤,从user_corpwx_time表中获取请假时长
|
|
//如果没有开通OA模块,有开通企业微信同步考勤,从user_corpwx_time表中获取请假时长
|