|
@@ -13,16 +13,15 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
|
|
|
import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
+import org.apache.commons.beanutils.ConvertUtils;
|
|
|
+import org.apache.commons.beanutils.converters.DateConverter;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageImpl;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
|
|
import java.text.DecimalFormat;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -191,6 +190,7 @@ public class ExamStudentEntityConvert {
|
|
|
try {
|
|
|
// 转换Map数据
|
|
|
ExamStudentInfo info = new ExamStudentInfo();
|
|
|
+ ConvertUtils.register(new DateConverter(null), Date.class);
|
|
|
BeanUtils.populate(info, map);
|
|
|
// 转换枚举名称
|
|
|
info.setCourseLevel(CourseLevel.getCourseLevelTitle(info.getCourseLevel()));
|
|
@@ -211,6 +211,7 @@ public class ExamStudentEntityConvert {
|
|
|
try {
|
|
|
// 转换Map数据
|
|
|
ExamStudentOrgStatistic info = new ExamStudentOrgStatistic();
|
|
|
+ ConvertUtils.register(new DateConverter(null), Date.class);
|
|
|
BeanUtils.populate(info, map);
|
|
|
if (info.getTotalCount() == 0 || info.getFinishedCount() == 0) {
|
|
|
info.setFinishedPercent("0");
|