|
@@ -200,16 +200,16 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
|
|
|
Map<Long, List<ResultViewingPageVo>> personListMap = resultData.stream().collect(Collectors.groupingBy(ResultViewingPageVo::getObjectId));
|
|
|
for (Long objectId : personListMap.keySet()) {
|
|
|
List<ResultViewingPageVo> itemList = personListMap.get(objectId);
|
|
|
- Map<Long, Double> itemListMap = itemList.stream().collect(Collectors.groupingBy(ResultViewingPageVo::getEvaluateManageItemId, Collectors.summingDouble(ResultViewingPageVo::getScore)));
|
|
|
- for (Long itemId : itemListMap.keySet()) {
|
|
|
- itemListMaps.put(objectId + "" + itemId, itemListMap.get(itemId));
|
|
|
+ Map<String, Double> itemListMap = itemList.stream().collect(Collectors.groupingBy(ResultViewingPageVo::getTopic, Collectors.summingDouble(ResultViewingPageVo::getScore)));
|
|
|
+ for (String topic : itemListMap.keySet()) {
|
|
|
+ itemListMaps.put(objectId + "" + topic, itemListMap.get(topic));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
for (ResultViewingPageVo pageVo : resultData) {
|
|
|
pageVo.setSynthesisScore(synthesisScoreMap.get(pageVo.getObjectId()) + "");
|
|
|
|
|
|
- Double itemScore = itemListMaps.get(pageVo.getObjectId() + "" + pageVo.getEvaluateManageItemId());
|
|
|
+ Double itemScore = itemListMaps.get(pageVo.getObjectId() + "" + pageVo.getTopic());
|
|
|
pageVo.setTopicScore(itemScore + "");
|
|
|
}
|
|
|
|