fix: 月度统计完成总人数不对的bug
This commit is contained in:
@@ -42,7 +42,7 @@ public class TrainingPlanMonthlyStatProvider implements IReportDataProvider {
|
|||||||
private final IHotTrainingCourseConfigService hotTrainingCourseConfigService;
|
private final IHotTrainingCourseConfigService hotTrainingCourseConfigService;
|
||||||
private final IHotCourseResourceService hotCourseResourceService;
|
private final IHotCourseResourceService hotCourseResourceService;
|
||||||
private final HotMediaResourceMapper hotMediaResourceMapper;
|
private final HotMediaResourceMapper hotMediaResourceMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTemplateCode() {
|
public String getTemplateCode() {
|
||||||
return "templates/securityManage/onlineEducationMonthlyStatistics.html.vm";
|
return "templates/securityManage/onlineEducationMonthlyStatistics.html.vm";
|
||||||
@@ -78,12 +78,12 @@ public class TrainingPlanMonthlyStatProvider implements IReportDataProvider {
|
|||||||
ctx.put("trainingCourses", buildTrainingCourses(trainingId));
|
ctx.put("trainingCourses", buildTrainingCourses(trainingId));
|
||||||
ctx.put("trainingContent", buildTrainingContent(trainingId));
|
ctx.put("trainingContent", buildTrainingContent(trainingId));
|
||||||
|
|
||||||
|
ctx.put("completedCount", training.getCompleteCount() == null ? 0L : training.getCompleteCount());
|
||||||
List<OnlineTrainingMonthlyRowVo> voRows = ledgerReportMapper.selectOnlineTrainingMonthlyRows(companyId, trainingId, normalizedUserIds);
|
List<OnlineTrainingMonthlyRowVo> voRows = ledgerReportMapper.selectOnlineTrainingMonthlyRows(companyId, trainingId, normalizedUserIds);
|
||||||
if (voRows == null || voRows.isEmpty()) {
|
if (voRows == null || voRows.isEmpty()) {
|
||||||
return ctx;
|
return ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.put("completedCount", countCompleted(voRows));
|
|
||||||
ctx.put("rows", buildRows(voRows, progressMap));
|
ctx.put("rows", buildRows(voRows, progressMap));
|
||||||
return ctx;
|
return ctx;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user