|
|
@@ -116,7 +116,7 @@ public class FiveDimensionSelfCheckService {
|
|
|
if (result.size() < count) {
|
|
|
for (SelfCheckQuestionVO q : pool) {
|
|
|
if (result.size() >= count) break;
|
|
|
- if (excludeSet.contains(q.getId())) continue;
|
|
|
+ if (!excludeSet.contains(q.getId())) continue;
|
|
|
boolean alreadyIn = false;
|
|
|
for (SelfCheckQuestionVO r : result) {
|
|
|
if (r.getId().equals(q.getId())) { alreadyIn = true; break; }
|
|
|
@@ -440,12 +440,6 @@ public class FiveDimensionSelfCheckService {
|
|
|
answerMap.put(item.getQuestionId(), item.getAnswer().trim().toUpperCase());
|
|
|
}
|
|
|
|
|
|
- // 构建 题号→题目 映射(从合并池)
|
|
|
- Map<Integer, SelfCheckQuestionVO> questionMap = new LinkedHashMap<>();
|
|
|
- for (SelfCheckQuestionVO q : FULL_QUESTION_POOL) {
|
|
|
- questionMap.put(q.getId(), q);
|
|
|
- }
|
|
|
-
|
|
|
// 按维度分组计分
|
|
|
Map<String, List<SelfCheckQuestionVO>> dimGroups = groupByDimension(FULL_QUESTION_POOL);
|
|
|
List<SelfCheckResultVO.DimensionScoreVO> dimensions = new ArrayList<>();
|