优化一下sql结构

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -91,7 +91,8 @@
 			fc ON f.sequence_nbr = fc.firefighters_id left join cb_data_dictionary da 
 			on da.CODE = fc.relationship where f.is_delete = #{isDelete} -->
 		SELECT
-			f.*, (
+	f.*,
+	(
 		SELECT
 			cb_fire_team. NAME
 		FROM
@@ -100,7 +101,15 @@
 			cb_fire_team.sequence_nbr = f.fire_team_id
 	) fireTeam,
 	emergency_contact,
-		da. NAME AS relationship,
+	(
+		SELECT
+			NAME
+		FROM
+			cb_data_dictionary
+		WHERE
+			CODE = fc.relationship
+		AND type = 'RJGX'
+	) AS relationship,
 	emergency_contact_phone,
 	fw.working_hours,
 	fw.fire_working_hours,
@@ -112,16 +121,14 @@
 		WHERE
 			CODE = fe.first_degree
 		AND type = 'XLLX'
-		) AS
-		first_degree,
+	) AS first_degree,
 	(
 		SELECT
 			NAME
 		FROM
 			cb_data_dictionary
 		WHERE
-				CODE =
-			fe.highest_education
+			CODE = fe.highest_education
 		AND type = 'XLLX'
 	) AS highest_education,
 	(
@@ -131,22 +138,23 @@
 			cb_data_dictionary
 		WHERE
 			CODE = fe.academic_degree
-			AND type ='XWLX'
+		AND type = 'XWLX'
 	) AS academic_degree,
 	fe.school,
 	fe.professional_name,
 	fp.*
-		FROM
+FROM
 	cb_firefighters f
-		LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr = fc.firefighters_id
-		LEFT JOIN cb_data_dictionary da ON da. CODE = fc.relationship
-		LEFT JOIN cb_firefighters_workexperience fw ON f.sequence_nbr = fw.firefighters_id
-		LEFT JOIN cb_firefighters_education fe ON f.sequence_nbr = fe.firefighters_id
-		LEFT JOIN cb_firefighters_post fp ON f.sequence_nbr = fp.firefighters_id
-		WHERE
-		f.is_delete = 0 and fc.is_delete=0 and
-		fw.is_delete=0 and fe.is_delete=0 and
-		fp.is_delete=0
+LEFT JOIN cb_firefighters_contacts fc ON f.sequence_nbr = fc.firefighters_id
+LEFT JOIN cb_firefighters_workexperience fw ON f.sequence_nbr = fw.firefighters_id
+LEFT JOIN cb_firefighters_education fe ON f.sequence_nbr = fe.firefighters_id
+LEFT JOIN cb_firefighters_post fp ON f.sequence_nbr = fp.firefighters_id
+WHERE
+	f.is_delete = 0
+AND fc.is_delete = 0
+AND fw.is_delete = 0
+AND fe.is_delete = 0
+AND fp.is_delete = 0
 	</select>
 
 </mapper>