增加记录点检人 点检时间

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

@@ -440,58 +440,19 @@
     </select>
      -->
     <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
-        SELECT 0 AS                                                                     type_flag,
-               fat.submit_time                                                          check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_user_id) check_person
-        FROM first_article_task fat,
-             first_article_calendar fac,
-             us_user uu,
-             first_article_item_result fair,
-             first_article_item fai
-        WHERE fat.first_article_calendar_id = fac.id
-          AND fair.first_article_task_id = fat.id
-          AND fair.first_article_item_id = fai.id
-          AND fair.created_user_id = uu.id
-          AND fat.task_time = #{req.checkDate}
-          AND fac.benteler_plan_id = #{req.bentelerPlanId}
-          AND fai.first_flag = 1
-
-        UNION ALL
-
-        SELECT 1 AS                                                                     type_flag,
-               fat.submit_time                                                          check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_user_id) check_person
-        FROM first_article_task fat,
-             first_article_calendar fac,
-             us_user uu,
-             first_article_item_result fair,
-             first_article_item fai
-        WHERE fat.first_article_calendar_id = fac.id
-          AND fair.first_article_task_id = fat.id
-          AND fair.first_article_item_id = fai.id
-          AND fair.created_user_id = uu.id
-          AND fat.task_time = #{req.checkDate}
-          AND fac.benteler_plan_id = #{req.bentelerPlanId}
-          AND fai.two_hundred_flag = 1
-
-        UNION ALL
-
-        SELECT 2 AS                                                                     type_flag,
-               fat.submit_time                                                          check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_user_id) check_person
-        FROM first_article_task fat,
-             first_article_calendar fac,
-             us_user uu,
-             first_article_item_result fair,
-             first_article_item fai
-        WHERE fat.first_article_calendar_id = fac.id
-          AND fair.first_article_task_id = fat.id
-          AND fair.first_article_item_id = fai.id
-          AND fair.created_user_id = uu.id
-          AND fat.task_time = #{req.checkDate}
-          AND fac.benteler_plan_id = #{req.bentelerPlanId}
-          AND fai.catch_flag = 1
-
+        select fat.type_flag as                       type_flag,
+               (
+                   select uu2.username
+                   from us_user uu2
+                   where uu2.id = fat.submit_user_id) check_person,
+
+               fat.submit_time                        taskTime
+        from first_article_task fat,
+             first_article_calendar fac
+        where fac.benteler_plan_id = #{req.bentelerPlanId}
+          and fat.first_article_calendar_id = fac.id
+          and fat.task_time = #{req.checkDate}
+        group by fat.type_flag
     </select>
 
     <!-- 取得重检项目下（result_bak = 1），未完成重检（result = -1）的item_result数量，如果重检了result会变成0或1 -->