接口-name改为userName

application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -8,7 +8,7 @@
         SELECT
 			bp.id AS benteler_plan_id,
 			bp.`name` AS benteler_plan_name,
-			GROUP_CONCAT( uu.`name` ) AS check_person,
+			GROUP_CONCAT( uu.username ) AS check_person,
 			bp.created_time,
 			bp.pause_flag,
 			ps.plan_status
@@ -253,7 +253,7 @@
     <select id="getFaNoGoTaskAapproval" resultType="com.factory.web.entity.fa.res.FaNoGoTaskAapprovalRes">
         SELECT
 			faat.approval_user_id,
-			uu.`name` AS approval_person,
+			uu.username AS approval_person,
 			faat.reason,
 			faat.updated_time AS approval_time 
 		FROM
@@ -388,7 +388,7 @@
     <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
         SELECT DISTINCT fac.type_flag,
 		       fat.task_time,
-			   uu.`name` AS check_person
+			   uu.username AS check_person
 		FROM   first_article_task fat,
 			   first_article_calendar fac,
 			   us_user uu
@@ -402,7 +402,7 @@
 			0 AS type_flag,
 			fat.task_time,
 			MIN( fair.created_time ) AS check_time,
-			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+			GROUP_CONCAT( DISTINCT uu.username ) AS check_person 
 		FROM
 			first_article_task fat,
 			first_article_calendar fac,
@@ -424,7 +424,7 @@
 			1 AS type_flag,
 			fat.task_time,
 			MIN( fair.created_time ) AS check_time,
-			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+			GROUP_CONCAT( DISTINCT uu.username ) AS check_person 
 		FROM
 			first_article_task fat,
 			first_article_calendar fac,
@@ -446,7 +446,7 @@
 			2 AS type_flag,
 			fat.task_time,
 			MIN( fair.created_time ) AS check_time,
-			GROUP_CONCAT( DISTINCT uu.`name` ) AS check_person 
+			GROUP_CONCAT( DISTINCT uu.username ) AS check_person 
 		FROM
 			first_article_task fat,
 			first_article_calendar fac,

application-facade/src/main/resources/mapper/PreventMistakeMapper.xml

@@ -8,7 +8,7 @@
         SELECT
 			bp.id AS benteler_plan_id,
 			bp.`name` AS benteler_plan_name,
-			GROUP_CONCAT( uu.`name` ) AS check_person,
+			GROUP_CONCAT( uu.username ) AS check_person,
 			bp.created_time,
 			bp.pause_flag,
 			ps.plan_status
@@ -209,7 +209,7 @@
 			bp.id AS benteler_plan_id,
 			oc.id AS onsite_calendar_id,
 			oc.type_flag,
-			uu.`name` AS check_person,
+			uu.username AS check_person,
 			ot.id AS onsite_task_id,
 			MIN(oir.created_time) AS check_time
 		FROM
@@ -261,7 +261,7 @@
     <select id="getPmNoGoTaskAapproval" resultType="com.factory.web.entity.pm.res.PmNoGoTaskAapprovalRes">
         SELECT
 			oat.approval_user_id,
-			uu.`name` AS approval_person,
+			uu.username AS approval_person,
 			oat.reason,
 			oat.updated_time AS approval_time 
 		FROM
@@ -281,7 +281,7 @@
         SELECT  oir.onsite_item_id,
 		        oi.item_content,
 				oat.approval_user_id,
-				uu.`name` AS approval_person,
+				uu.username AS approval_person,
 				oat.updated_time AS approval_time
 		FROM    onsite_item_result oir,
 		        onsite_task ot,
@@ -369,7 +369,7 @@
 		        bp.`name` AS benteler_plan_name,
 				bp.plan_type,
 				oat.approval_level,
-				uu.`name` AS person,
+				uu.username AS person,
 				1 AS method,
 				oat.reason,
 				oat.updated_time,
@@ -395,7 +395,7 @@
         SELECT  oc.benteler_plan_id,
         		bp.`name` AS benteler_plan_name,
 			    bp.plan_type,
-				uu.`name` AS person,
+				uu.username AS person,
 				2 AS method,
 				ot.`status`,
 				oc.type_flag,
@@ -439,7 +439,7 @@
         		bp.`name` AS benteler_plan_name,
 			    bp.plan_type,
 				faat.approval_level,
-				uu.`name` AS person,
+				uu.username AS person,
 				1 AS method,
 				faat.reason,
 				faat.updated_time,
@@ -465,7 +465,7 @@
         SELECT  fac.benteler_plan_id,
         		bp.`name` AS benteler_plan_name,
 			    bp.plan_type,
-				uu.`name` AS person,
+				uu.username AS person,
 				2 AS method,
 				fat.`status`,
 				fac.type_flag,