|
@@ -22,6 +22,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
|
|
|
|
+import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
import com.qunzhixinxi.hnqz.admin.api.vo.UserVO;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysDeptSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
|
|
@@ -985,17 +986,17 @@ public class SysUserController {
|
|
|
|
|
|
userVosPage.getRecords().forEach(vo -> {
|
|
userVosPage.getRecords().forEach(vo -> {
|
|
List<WmPlatformQuizTestResult> testResults = quizTestResult.get(vo.getUserId());
|
|
List<WmPlatformQuizTestResult> testResults = quizTestResult.get(vo.getUserId());
|
|
- List<WmPlatformQuizTestResult> pure;
|
|
|
|
|
|
+ List<WmQuizResultModel> pure = null;
|
|
if (CollUtil.isNotEmpty(testResults)) {
|
|
if (CollUtil.isNotEmpty(testResults)) {
|
|
Map<Integer, List<WmPlatformQuizTestResult>> collect = testResults.stream().collect(Collectors.groupingBy(WmPlatformQuizTestResult::getQuizId));
|
|
Map<Integer, List<WmPlatformQuizTestResult>> collect = testResults.stream().collect(Collectors.groupingBy(WmPlatformQuizTestResult::getQuizId));
|
|
pure = new ArrayList<>(collect.size());
|
|
pure = new ArrayList<>(collect.size());
|
|
|
|
|
|
for (Map.Entry<Integer, List<WmPlatformQuizTestResult>> entry : collect.entrySet()) {
|
|
for (Map.Entry<Integer, List<WmPlatformQuizTestResult>> entry : collect.entrySet()) {
|
|
- pure.add(entry.getValue().get(0));
|
|
|
|
|
|
+ pure.add(entry.getValue().get(0).getQuizResult());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- vo.setTestResults(quizTestResult.get(vo.getUserId()));
|
|
|
|
|
|
+ vo.setQuizResult(CollUtil.isEmpty(pure) ? Collections.emptyList() : pure);
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|