合并冲突

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

@@ -1,18 +1,19 @@
 package com.factory.web.entity.fa;
 
+import java.io.Serializable;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * 工作站
  *
@@ -32,8 +33,6 @@ public class FirstArticleWorkshop implements Serializable {
 
     @ApiModelProperty(value = "计划id")
     private Long bentelerPlanId;
-    
- 
 
     @ApiModelProperty(value = "工作站名称")
     private String wsName;
@@ -52,4 +51,5 @@ public class FirstArticleWorkshop implements Serializable {
     @ApiModelProperty(value = "任务id")
     private Long taskId;
 
+
 }

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

@@ -440,10 +440,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,
@@ -459,10 +458,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,
@@ -478,10 +476,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,