术语关系修改

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

@@ -136,7 +136,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		List<Long> relationIdList = new ArrayList<>();
 		
 		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
-		relationQe.eq("end_id", conceptId);
+		relationQe.eq("start_id", conceptId);
 		relationQe.eq(relationId!=null,"relation_id", relationId);
 		List<Relation> relationList = list(relationQe);
 		
@@ -239,7 +239,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 */
 	private void repairRelationDataForDel(Long conceptId,Long relationId,String isDeleted,String currentUser,Date now){
 		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
-		relationQe.eq("end_id", conceptId);
+		relationQe.eq("start_id", conceptId);
 		relationQe.eq(relationId!=null,"relation_id", relationId);
 		List<Relation> relationList = list(relationQe);
 		

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

@@ -52,10 +52,10 @@
     
     <select id="getRelationNodeDTOs" resultType="com.diagbot.dto.RelationNodeDTO">
     	SELECT
-			c.id AS conceptId,
-			c.lib_name AS conceptName,
-			d.id AS parentConceptId,
-			d.lib_name AS parentConceptName,
+			d.id AS conceptId,
+			d.lib_name AS conceptName,
+			c.id AS parentConceptId,
+			c.lib_name AS parentConceptName,
 			e.id AS relationId,
 			e.`name` AS relationName
 		FROM kl_relation a LEFT JOIN kl_relation_order b ON a.id=b.t_relation_id
@@ -67,7 +67,7 @@
  		AND c.is_deleted='N'
  		AND d.is_deleted='N'
  		AND e.is_deleted='N'
- 		AND a.end_id=#{conceptId} 
+ 		AND a.start_id=#{conceptId} 
  		<if test="relationId!=null">
  			AND a.relation_id=#{relationId}
  		</if>
@@ -79,11 +79,11 @@
 			*
 		FROM
 		(SELECT
-		t3.id AS conceptId,
-		t3.lib_name AS libName,
+		t2.id AS conceptId,
+		t2.lib_name AS libName,
 		t4.name AS libType,
-		CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t2.lib_name ORDER BY t1.gmt_modified DESC) AS otherNames,
+		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
+		GROUP_CONCAT(t3.lib_name ORDER BY t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
 		t1.is_deleted AS isDeleted
@@ -94,15 +94,15 @@
 		(SELECT * FROM kl_relation WHERE relation_id=17) a
 		LEFT JOIN kl_relation_order b ON a.id=b.t_relation_id
 		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) c
-		ON a.start_id=c.end_id
+		ON a.end_id=c.start_id
 		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) d
-		ON a.end_id=d.start_id
+		ON a.start_id=d.end_id
 		WHERE b.id IS NULL AND c.id IS NULL AND d.id IS NULL) t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
 		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
 		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
-		GROUP BY t3.id) tab
+		GROUP BY t2.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
 			and libNameType like concat('%',#{name},'%')
@@ -115,11 +115,11 @@
 			*
 		FROM
 		(SELECT
-		t3.id AS conceptId,
-		t3.lib_name AS libName,
+		t2.id AS conceptId,
+		t2.lib_name AS libName,
 		t4.name AS libType,
-		CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t2.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
+		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
+		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
 		t1.is_deleted AS isDeleted
@@ -130,14 +130,14 @@
 		(SELECT * FROM kl_relation WHERE relation_id=17) a
 		JOIN kl_relation_order b ON a.id=b.t_relation_id
 		LEFT JOIN (SELECT * FROM kl_relation WHERE relation_id=17) c
-		ON a.end_id=c.start_id
+		ON a.start_id=c.end_id
 		WHERE c.id IS NULL) t1
 		JOIN kl_concept t2 ON t1.start_id=t2.id
 		JOIN kl_concept t3 ON t1.end_id=t3.id
 		JOIN kl_lexicon t4 ON t3.lib_type=t4.id
 		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
 		where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
-		GROUP BY t3.id) tab
+		GROUP BY t2.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
 			and libNameType like concat('%',#{name},'%')
@@ -150,11 +150,11 @@
 			*
 		FROM
 		(SELECT  
-		t3.id AS conceptId,
-		t3.lib_name AS libName,
+		t2.id AS conceptId,
+		t2.lib_name AS libName,
 		t4.name AS libType,
-		CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
-		GROUP_CONCAT(t2.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
+		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
+		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
 		t1.is_deleted AS isDeleted
@@ -165,7 +165,7 @@
 		LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
 		WHERE t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
 		AND t1.relation_id=18
-		GROUP BY t3.id) tab
+		GROUP BY t2.id) tab
 		where 1=1
 		<if test="name!=null and name!=''">
 			and libNameType like concat('%',#{name},'%')