|
|
@@ -207,7 +207,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
.eq("return_type", 1)
|
|
|
.orderByDesc("order_no");
|
|
|
List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
|
|
|
- Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo ->dictionaryInfo));
|
|
|
+ Map<String, DictionaryInfo> dictionaryInfoMap = dictionaryInfoList.stream().collect(Collectors.toMap(DictionaryInfo::getVal,dictionaryInfo -> dictionaryInfo));
|
|
|
//获取用户信息
|
|
|
RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
|
|
|
if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
|
|
|
@@ -240,18 +240,12 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
|
|
|
QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
|
|
|
questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
|
|
|
- Map<Long, QuestionInfo> questionInfoMap = new HashMap<>();
|
|
|
- for (QuestionInfo questionInfo : questionInfoList) {
|
|
|
- questionInfoMap.put(questionInfo.getId(), questionInfo);
|
|
|
- }
|
|
|
+ Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo ->questionInfo));
|
|
|
//获取模板信息
|
|
|
QueryWrapper<ModuleInfo> moduleInfoQueryWrapper = new QueryWrapper<>();
|
|
|
questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
List<ModuleInfo> moduleInfoList = this.list(moduleInfoQueryWrapper);
|
|
|
- Map<Long, ModuleInfo> moduleInfoMap = new HashMap<>();
|
|
|
- for (ModuleInfo moduleInfo : moduleInfoList) {
|
|
|
- moduleInfoMap.put(moduleInfo.getId(), moduleInfo);
|
|
|
- }
|
|
|
+ Map<Long, ModuleInfo> moduleInfoMap = moduleInfoList.stream().collect(Collectors.toMap(ModuleInfo::getId,moduleInfo -> moduleInfo));
|
|
|
//循环给出参赋值
|
|
|
for (ModuleDetail moduleDetail : moduleDetailList) {
|
|
|
getModuleDetailInfoDTO = new GetModuleDetailInfoDTO();
|
wangyu