Explorar el Código

feat: support quiz test result to user list

shc hace 1 año
padre
commit
f278737ddc

+ 2 - 1
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -3,6 +3,7 @@ package com.qunzhixinxi.hnqz.admin.api.vo;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
+import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import com.qunzhixinxi.hnqz.common.core.sensitive.Sensitive;
 import com.qunzhixinxi.hnqz.common.core.sensitive.SensitiveTypeEnum;
 import lombok.Data;
@@ -227,6 +228,6 @@ public class UserVO implements Serializable {
 
 
 	@TableField(exist = false)
-	private List<WmPlatformQuizTestResult> testResults;
+	private List<WmQuizResultModel> quizResult;
 
 }

+ 4 - 3
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -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.SysUserRole;
 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.entity.SysDeptSub;
 import com.qunzhixinxi.hnqz.admin.entity.SysUserSub;
@@ -985,17 +986,17 @@ public class SysUserController {
 
 			userVosPage.getRecords().forEach(vo -> {
 				List<WmPlatformQuizTestResult> testResults = quizTestResult.get(vo.getUserId());
-				List<WmPlatformQuizTestResult> pure;
+				List<WmQuizResultModel> pure = null;
 				if (CollUtil.isNotEmpty(testResults)) {
 					Map<Integer, List<WmPlatformQuizTestResult>> collect = testResults.stream().collect(Collectors.groupingBy(WmPlatformQuizTestResult::getQuizId));
 					pure = new ArrayList<>(collect.size());
 
 					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);
 			});