增加记录点检人 点检时间

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

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -49,6 +50,11 @@ public class FirstArticleTask implements Serializable {
     @ApiModelProperty(value = "首件类型 0首件 1：200件 2中断")
     private Integer typeFlag;
 
+    @ApiModelProperty(value = "点检人")
+    private Long submitUserId;
+
+    @ApiModelProperty(value = "点检时间")
+    private LocalDateTime submitTime;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "任务审批信息")

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * 首件计划
@@ -29,7 +30,7 @@ public class FaCalendarRes implements Serializable {
     private Integer typeFlag;
 
     @ApiModelProperty(value = "检验时间")
-    private LocalDate taskTime;
+    private LocalDateTime taskTime;
 
     @ApiModelProperty(value = "检验人")
     private String checkPerson;

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -6,6 +6,7 @@ import java.io.File;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -848,13 +849,13 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             searchFaTaskInfoReq.setStatus(0); // task状态为0初始化
         }
         FirstArticleTask faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
-
         long firstArticleTaskId = 0;
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
             if (faTaskInfo == null) {
                 return ResponseBeanBuilder.fail("计划任务不存在！");
             } else {
                 if (faTaskInfo.getStatus() == 0 || faTaskInfo.getStatus() == 3) { // 首次提交和重检提交
+
                     firstArticleTaskId = faTaskInfo.getId();
                 } else {
                     return ResponseBeanBuilder.fail("该计划任务已处理！无需重复提交！");
@@ -888,19 +889,21 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 break;
             }
         }
-
+        FirstArticleTask firstArticleTask = FirstArticleTask.builder()
+                .id(firstArticleTaskId)
+                .status(4)
+                .build();
+        //首次提交记录点检人点检时间
+        if (faTaskInfo.getStatus() == 0) {
+            firstArticleTask.setSubmitTime(LocalDateTime.now());
+            firstArticleTask.setSubmitUserId(commonService.getLoginUserInfo().getId());
+        }
         if (flag) { // 巡检项目都通过
-            FirstArticleTask firstArticleTask = FirstArticleTask.builder()
-                    .id(firstArticleTaskId)
-                    .status(4)
-                    .build();
+            firstArticleTask.setStatus(4);
             firstArticleTaskService.updateById(firstArticleTask);
         } else { // 巡检项目有不通过的
             /* 更新任务为1待审核状态。等待后续审核 */
-            FirstArticleTask firstArticleTask = FirstArticleTask.builder()
-                    .id(firstArticleTaskId)
-                    .status(1)
-                    .build();
+            firstArticleTask.setStatus(1);
             firstArticleTaskService.updateById(firstArticleTask);
 
             /* 删除之前的审批记录 */

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

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