化验公表项查询sql修改

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

@@ -17,24 +17,29 @@
     
     <select id="getAllLisConcept" parameterType="com.diagbot.vo.GetAllLisConceptVO" resultType="com.diagbot.dto.GetAllLisConceptDTO">
     	SELECT
-    		conceptName
-    	FROM
-    	((SELECT
-		lib_name as conceptName
-		FROM kl_concept
+			conceptName
+		FROM
+		((SELECT
+		@rowNo:=@rowNo+1 as taocanNum,
+		lib_name as conceptName,
+		0 AS zixiangNum
+		FROM kl_concept,(select @rowNo:=0) num_tab 
 		WHERE is_deleted='N' AND lib_type=12
 		ORDER BY gmt_modified DESC)
 		UNION
 		(SELECT
-		CONCAT(t1.conceptName,'-',t3.conceptName) as conceptName
+		t1.taocanNum,
+		CONCAT(t1.conceptName,'-',t3.conceptName) as conceptName,
+		@rowNo:=@rowNo+1 as zixiangNum
 		FROM
 		(SELECT
 		id as conceptId,
-		lib_name as conceptName
-		FROM kl_concept
-		WHERE is_deleted='N' AND lib_type=12) t1
-		JOIN
-		kl_relation t2 
+		lib_name as conceptName,
+		@rowNo:=@rowNo+1 as taocanNum
+		FROM kl_concept,(select @rowNo:=0) num_tab 
+		WHERE is_deleted='N' AND lib_type=12
+		ORDER BY gmt_modified DESC) t1
+		JOIN kl_relation t2 
 		ON t1.conceptId=t2.end_id 
 		JOIN
 		(SELECT
@@ -44,9 +49,9 @@
 		WHERE is_deleted='N' AND lib_type=13) t3
 		ON t2.start_id=t3.conceptId
 		LEFT JOIN kl_relation_order t4
-		ON t2.id=t4.t_relation_id
-		WHERE t2.is_deleted='N' AND t2.relation_id=3
-		ORDER BY t4.order_no DESC)) t
+		ON t2.id=t4.t_relation_id,(select @rowNo:=0) num_tab 
+		WHERE t2.is_deleted='N' AND t2.relation_id=18
+		ORDER BY t4.order_no DESC,t2.gmt_modified DESC)) tab
 		WHERE 1=1
 		<if test="conceptName!=null and conceptName!=''">
 			and (conceptName LIKE CONCAT('%',#{conceptName},'%'))
@@ -58,6 +63,7 @@
 			</foreach>
 			)
 		</if>
+		ORDER BY taocanNum ASC,zixiangNum ASC
     </select>
     
 	<select id="getConcept" resultType="com.diagbot.dto.ConceptRes" parameterType="com.diagbot.entity.wrapper.ConceptWrapper">