静态知识修改2

knowledgeman-service/src/main/java/com/diagbot/dto/GetConceptDetailListDTO.java

@@ -46,6 +46,24 @@ public class GetConceptDetailListDTO {
      */
     @ApiModelProperty(value="概念名称")
     private String libName;
+    
+    /**
+     * 概念名称(类型)
+     */
+    @ApiModelProperty(value="概念名称(类型)")
+    private String nameType;
+    
+    /**
+     * 类型id
+     */
+    @ApiModelProperty(value="类型id")
+    private Long typeId;
+    
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value="类型名称")
+    private String type;
 
 
     /**

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -64,6 +64,8 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
             }
             ipage.getRecords().forEach(i -> {
                 i.setModifier(respDTO.data.get(i.getModifier()));
+                i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+                i.setNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getTypeId().intValue())+")");
             });
         }
         return ipage;

knowledgeman-service/src/main/resources/mapper/ConceptDetailMapper.xml

@@ -20,7 +20,7 @@
     </resultMap>
 
    	<select id="getConceptDetailList" resultType="com.diagbot.dto.GetConceptDetailListDTO">
-   		SELECT b.id concept_id, b.lib_name, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
+   		SELECT b.id concept_id, b.lib_name,b.lib_type as typeId, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
 		FROM kl_concept_detail a ,kl_concept b
 		WHERE   b.is_deleted='N' and a.concept_id=b.id
 		<if test="conceptName!=null and conceptName!=''">