|
@@ -124,6 +124,7 @@ public class TaskStatisticsServiceImpl implements TaskStatisticsService {
|
|
|
taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
|
|
taskStatisticsVo.setEndDate(dateMapByType.get("endDate"));
|
|
|
|
|
|
|
|
IPage<TaskStatisticsDto> list = this.insAreaCompanyMapper.queryPageTaskStatistics(page,taskStatisticsVo);
|
|
IPage<TaskStatisticsDto> list = this.insAreaCompanyMapper.queryPageTaskStatistics(page,taskStatisticsVo);
|
|
|
|
|
+ Long total = this.insAreaCompanyMapper.queryPageTaskStatisticsTotal(taskStatisticsVo);
|
|
|
if (list != null && !list.getRecords().isEmpty()) {
|
|
if (list != null && !list.getRecords().isEmpty()) {
|
|
|
List<TaskStatisticsDto> records = list.getRecords();
|
|
List<TaskStatisticsDto> records = list.getRecords();
|
|
|
for (TaskStatisticsDto record : records) {
|
|
for (TaskStatisticsDto record : records) {
|
|
@@ -159,7 +160,6 @@ public class TaskStatisticsServiceImpl implements TaskStatisticsService {
|
|
|
taskStatisticsVo.setUserId(null);
|
|
taskStatisticsVo.setUserId(null);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- Long total = this.insAreaCompanyMapper.queryPageTaskStatisticsTotal(taskStatisticsVo);
|
|
|
|
|
list.setTotal(total);
|
|
list.setTotal(total);
|
|
|
return list;
|
|
return list;
|
|
|
}
|
|
}
|