mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
jiangzhe 2024-04-12 13:55:39 +08:00
parent 1eeecb0ea2 6ae0717a99
commit b403c05b1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysEvaluationConclusionServiceImpl.java
View File

@ -177,6 +177,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus
evalConclusion.setFactorId(factorId);
evalConclusion.setRecordId(recordId);
evalConclusion.setStatus(StatusEnum.DISABLED.getValue());
evalConclusion.setScore(BigDecimal.ZERO);
list.add(evalConclusion);
List<SysScaleQuestionVo> questionNum = questionMapByFactor.get(factorId);
@ -285,8 +286,7 @@ public class SysEvaluationConclusionServiceImpl implements ISysEvaluationConclus
if (!ArrayUtil.isEmpty(scaleFactorVos) && !ArrayUtil.isEmpty(scaleFactorRangeVos)) {
Map<Long, List<SysScaleFactorRangeVo>> map = scaleFactorRangeVos.stream()
.collect(Collectors.groupingBy(SysScaleFactorRangeVo::getFactorId));
scaleFactorVos.forEach(item ->
item.setFactorRangeList(map.get(item.getFactorId())));
scaleFactorVos.forEach(item -> item.setFactorRangeList(map.get(item.getFactorId())));
}
return scaleFactorVos;
}