|
|
@ -116,7 +116,7 @@ public class QueryReportServiceImpl implements QueryReportService {
|
|
|
|
StatisticalReportDTO condition = getStatisticalReportDTO(s);
|
|
|
|
StatisticalReportDTO condition = getStatisticalReportDTO(s);
|
|
|
|
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
|
|
|
|
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: 2022/5/6 0006 这里将统计今日的数据
|
|
|
|
// 这里将统计今日的数据
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
|
|
|
|
if (!betweenDays) {
|
|
|
|
if (!betweenDays) {
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
|
|
|
@ -196,7 +196,7 @@ public class QueryReportServiceImpl implements QueryReportService {
|
|
|
|
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
|
|
|
|
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
|
|
|
|
List<TaskReport> list = new ArrayList<>();
|
|
|
|
List<TaskReport> list = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: 2022/5/6 0006 这里将统计今日的数据
|
|
|
|
// 这里将统计今日的数据
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
|
|
|
|
if (betweenDays) {
|
|
|
|
if (betweenDays) {
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
|
|
|
@ -328,7 +328,7 @@ public class QueryReportServiceImpl implements QueryReportService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: 2022/5/6 0006 这里将统计今日的数据
|
|
|
|
// 这里将统计今日的数据
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
if (betweenDays) {
|
|
|
|
if (betweenDays) {
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
|
|
|
@ -378,7 +378,7 @@ public class QueryReportServiceImpl implements QueryReportService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: 2022/5/6 0006 这里将统计今日的数据
|
|
|
|
// 这里将统计今日的数据
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
if (betweenDays) {
|
|
|
|
if (betweenDays) {
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
|
|
|
@ -559,7 +559,7 @@ public class QueryReportServiceImpl implements QueryReportService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndId(beginTime, endTime, memberId);
|
|
|
|
List<UserReport> userReports = userReportRepository.queryAllByTimeAndId(beginTime, endTime, memberId);
|
|
|
|
|
|
|
|
|
|
|
|
// TODO: 2022/5/6 0006 这里将统计今日的数据
|
|
|
|
// 这里将统计今日的数据
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
|
|
|
|
if (betweenDays) {
|
|
|
|
if (betweenDays) {
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndMemberId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), memberId);
|
|
|
|
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndMemberId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), memberId);
|
|
|
|