Browse Source

一期ICSS获取模板,添加子模板名称

wangyu 6 years ago
parent
commit
7a4ea6c30e

+ 1 - 0
icss-service/src/main/java/com/diagbot/dto/ModuleDetailDTO.java

@@ -25,5 +25,6 @@ public class ModuleDetailDTO extends QuestionDTO implements Serializable {
     private Long questionId; //questionId
     private String flag; //特殊标识
     private Long relationModule; //关联模板
+    private String relationModuleName;//关联模板名称
 
 }

+ 4 - 0
icss-service/src/main/java/com/diagbot/facade/ModuleFacade.java

@@ -51,6 +51,7 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
         List<Long> ids = data.stream()
                 .map(artist -> artist.getId())
                 .collect(Collectors.toList());
+        Map<Long,ModuleInfo> moduleInfoMap = list.stream().collect(Collectors.toMap(ModuleInfo::getId,moduleInfo -> moduleInfo));
         Map<Long, List<ModuleDetail>> moduleDetailMap = new LinkedHashMap<>();
         if (ListUtil.isNotEmpty(ids)) {
             Map<String, Object> paramMap = new HashMap<>();
@@ -75,6 +76,9 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                         QuestionDTO questionDTO = questionFacade.getById(questionVO);
                         BeanUtil.copyProperties(questionDTO, detailDTO);
                     }
+                    if(null != detailDTO.getRelationModule()){
+                        detailDTO.setRelationModuleName(moduleInfoMap.get(detailDTO.getRelationModule()).getName());
+                    }
                 }
                 bean.setModuleDetailDTOList(moduleDetailDTOList);
             }