增加记录点检人 点检时间

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleWorkshop.java

@@ -32,9 +32,6 @@ public class FirstArticleWorkshop implements Serializable {
 
     @ApiModelProperty(value = "计划id")
     private Long bentelerPlanId;
-    
-    @ApiModelProperty(value = "任务id")
-    private Long taskId;
 
     @ApiModelProperty(value = "工作站名称")
     private String wsName;
@@ -50,4 +47,8 @@ public class FirstArticleWorkshop implements Serializable {
     @ApiModelProperty(value = "0没完成 1全部完成")
     private Integer allCheckFlag;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "任务id")
+    private Long taskId;
+
 }

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

@@ -436,10 +436,9 @@
     </select>
      -->
     <select id="getFaCalendarList" resultType="com.factory.web.entity.fa.res.FaCalendarRes">
-        SELECT 0                      AS                                               type_flag,
-               fat.submit_time                                                         taskTime,
-               MIN(fair.created_time) AS                                               check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_userId) check_person
+        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,
@@ -455,10 +454,9 @@
 
         UNION ALL
 
-        SELECT 1                      AS                                               type_flag,
-               fat.task_time,
-               MIN(fair.created_time) AS                                               check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_userId) check_person
+        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,
@@ -474,10 +472,9 @@
 
         UNION ALL
 
-        SELECT 2                      AS                                               type_flag,
-               fat.task_time,
-               MIN(fair.created_time) AS                                               check_time,
-               (select uu2.username from us_user uu2 where uu2.id = fat.submit_userId) check_person
+        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,