修正统计详情中处理人

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

@@ -159,54 +159,74 @@
     </select>
     <!-- 防错重检信息 -->
     <select id="getPmRecheckedListByPlanId" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT  oc.benteler_plan_id,
-                bp.`name` AS benteler_plan_name,
-                bp.plan_type,
-                uu.username AS person,
-                2 AS method,
-                ot.`status`,
-                oc.type_flag,
-                ot.id AS task_id
-        FROM    onsite_task ot,
-                onsite_calendar oc,
-                benteler_plan bp,
-                us_user uu,
-                (
-                    SELECT DISTINCT othb.onsite_task_id
-                    FROM   onsite_task_his_blob othb,
-                           onsite_task ot
-                    WHERE  othb.onsite_task_id = ot.id
-                ) r
-        WHERE   ot.id = r.onsite_task_id
-          AND   ot.onsite_calendar_id = oc.id
-          AND   oc.benteler_plan_id = bp.id
-          AND   oc.user_id = uu.id
+        SELECT
+            oc.benteler_plan_id,
+            bp.`name` AS benteler_plan_name,
+            bp.plan_type,
+            uu.username AS person,
+            2 AS method,
+            oat.reason,
+            oat.updated_time,
+            ot.`status`,
+            oc.type_flag,
+            ot.id AS task_id
+        FROM
+            onsite_task ot,
+            onsite_approval_task oat,
+            onsite_calendar oc,
+            benteler_plan bp,
+            us_user uu,
+            (
+                SELECT DISTINCT
+                    othb.onsite_task_id
+                FROM
+                    onsite_task_his_blob othb,
+                    onsite_task ot
+                WHERE
+                    othb.onsite_task_id = ot.id
+            ) r
+        WHERE
+            ot.id = r.onsite_task_id
+          AND oat.onsite_task_id = r.onsite_task_id
+          AND ot.onsite_calendar_id = oc.id
+          AND oc.benteler_plan_id = bp.id
+          AND oc.user_id = uu.id
           AND   bp.id = #{planId}
     </select>
     <!-- 首件重检信息 -->
     <select id="getFaRecheckedListByPlanId" resultType="com.factory.web.entity.pm.res.AbnormalTaskInfoRes">
-        SELECT  fac.benteler_plan_id,
-                bp.`name` AS benteler_plan_name,
-                bp.plan_type,
-                uu.username AS person,
-                2 AS method,
-                fat.`status`,
-                fac.type_flag,
-                fat.id AS task_id
-        FROM    first_article_task fat,
-                first_article_calendar fac,
-                benteler_plan bp,
-                us_user uu,
-                (
-                    SELECT DISTINCT fathb.first_article_task_id
-                    FROM   first_article_task_his_blob fathb,
-                           first_article_task fat
-                    WHERE  fathb.first_article_task_id = fat.id
-                ) r
-        WHERE   fat.id = r.first_article_task_id
-          AND   fat.first_article_calendar_id = fac.id
-          AND   fac.benteler_plan_id = bp.id
-          AND   fac.user_id = uu.id
+        SELECT
+            fac.benteler_plan_id,
+            bp.`name` AS benteler_plan_name,
+            bp.plan_type,
+            uu.username AS person,
+            2 AS method,
+            faat.reason,
+            faat.updated_time,
+            fat.`status`,
+            fac.type_flag,
+            fat.id AS task_id
+        FROM
+            first_article_task fat,
+            first_article_approval_task faat,
+            first_article_calendar fac,
+            benteler_plan bp,
+            us_user uu,
+            (
+                SELECT DISTINCT
+                    fathb.first_article_task_id
+                FROM
+                    first_article_task_his_blob fathb,
+                    first_article_task fat
+                WHERE
+                    fathb.first_article_task_id = fat.id
+            ) r
+        WHERE
+            fat.id = r.first_article_task_id
+          AND faat.first_article_task_id = r.first_article_task_id
+          AND fat.first_article_calendar_id = fac.id
+          AND fac.benteler_plan_id = bp.id
+          AND fac.user_id = uu.id
           AND   bp.id = #{planId}
     </select>