别名维护修改

icssman-service/src/main/java/com/diagbot/dto/RetrievalListDTO.java

@@ -29,6 +29,12 @@ public class RetrievalListDTO {
 	@ApiModelProperty(value="标签名称")
 	private String questionName;
 	
+	/**
+	 * 标签归属
+	 */
+	@ApiModelProperty(value="标签归属")
+	private String questionType;
+	
 	/**
 	 * 本体
 	 */

icssman-service/src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -32,6 +32,7 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.Retrieval;
 import com.diagbot.entity.RetrievalMapping;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -70,7 +71,6 @@ public class RetrievalFacade extends RetrievalServiceImpl {
     @Qualifier("retrievalMappingServiceImpl")
     private RetrievalMappingService retrievalMappingService;
     
-
     /**
      * 根据标签获取同义词
      *
@@ -230,6 +230,8 @@ public class RetrievalFacade extends RetrievalServiceImpl {
         }
 
         List<Long> questionIds = retrievalListDTOList.stream().map(i -> i.getQuestionId()).collect(Collectors.toList());
+        
+        Map<Long,String> questionInfoTypeNameMap = questionFacade.listByIds(questionIds).stream().collect(Collectors.toMap(QuestionInfo::getId, i->QuestionTypeEnum.getName(i.getType())));
 
         QueryWrapper<RetrievalMapping> retrievalMappingQe = new QueryWrapper<RetrievalMapping>();
         retrievalMappingQe.in("question_id", questionIds);
@@ -246,6 +248,8 @@ public class RetrievalFacade extends RetrievalServiceImpl {
             retrievalListDTO.setRetrievalSelfName(retrievalMappingList.stream().filter(i -> i.getShowType() == 1 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
             retrievalListDTO.setRetrievalNames(retrievalMappingList.stream().filter(i -> i.getShowType() == 2 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
             retrievalListDTO.setRetrievalSonNames(retrievalMappingList.stream().filter(i -> i.getShowType() == 3 && i.getIsDeleted().equals("N")).map(i -> retrievalMap.get(i.getRetrievalId()).getName()).collect(Collectors.joining("、")));
+            
+            retrievalListDTO.setQuestionType(questionInfoTypeNameMap.get(retrievalListDTO.getQuestionId()));
         });
 
         List<String> ids = retrievalListDTOList.stream().map(i -> i.getOperatorName()).collect(Collectors.toList());