|
@@ -652,7 +652,8 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
Map<Long,ExamStudentOrgStatistic> finishMap=finishList.stream().collect(Collectors.toMap(ExamStudentOrgStatistic::getOrgId, account -> account));
|
|
Map<Long,ExamStudentOrgStatistic> finishMap=finishList.stream().collect(Collectors.toMap(ExamStudentOrgStatistic::getOrgId, account -> account));
|
|
|
|
|
|
for(ExamStudentOrgStatistic statistic:totalList) {
|
|
for(ExamStudentOrgStatistic statistic:totalList) {
|
|
- statistic.setFinishedCount(finishMap.get(statistic.getOrgId()).getFinishedCount());
|
|
|
|
|
|
+ ExamStudentOrgStatistic finish=finishMap.get(statistic.getOrgId());
|
|
|
|
+ statistic.setFinishedCount(finish==null?0:finish.getFinishedCount());
|
|
OrgCacheBean orgBean = gainBaseDataService.getOrgBean(statistic.getOrgId());
|
|
OrgCacheBean orgBean = gainBaseDataService.getOrgBean(statistic.getOrgId());
|
|
statistic.setOrgCode(orgBean.getCode());
|
|
statistic.setOrgCode(orgBean.getCode());
|
|
statistic.setOrgName(orgBean.getName());
|
|
statistic.setOrgName(orgBean.getName());
|
|
@@ -767,7 +768,8 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
Map<Long,CourseProgressInfo> finishMap=finishList.stream().collect(Collectors.toMap(CourseProgressInfo::getCourseId, account -> account));
|
|
Map<Long,CourseProgressInfo> finishMap=finishList.stream().collect(Collectors.toMap(CourseProgressInfo::getCourseId, account -> account));
|
|
|
|
|
|
for(CourseProgressInfo statistic:totalList) {
|
|
for(CourseProgressInfo statistic:totalList) {
|
|
- statistic.setCompletedNum(finishMap.get(statistic.getCourseId()).getCompletedNum());
|
|
|
|
|
|
+ CourseProgressInfo finish=finishMap.get(statistic.getCourseId());
|
|
|
|
+ statistic.setCompletedNum(finish==null?0:finish.getCompletedNum());
|
|
if (statistic.getAllNum() == 0 || statistic.getCompletedNum() == 0) {
|
|
if (statistic.getAllNum() == 0 || statistic.getCompletedNum() == 0) {
|
|
statistic.setCompletedProportion(0.0D);
|
|
statistic.setCompletedProportion(0.0D);
|
|
statistic.setNoCompletedNum(0);
|
|
statistic.setNoCompletedNum(0);
|