更新提交首件任务增加taskId,保存结果增加taskId

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

@@ -33,6 +33,9 @@ public class AddFaItemResultListReq {
     @ApiModelProperty(value = "点检人对应的用户ID")
     private Long userId;
 
+    @ApiModelProperty(value = "任务ID")
+    private Long taskId;
+    
     @ApiModelProperty(value = "巡检项目检查结果")
     private List<AddFaItemResultReq> addFaItemResultList;
 

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

@@ -1,6 +1,7 @@
 package com.factory.web.entity.fa.req;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -22,8 +23,8 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class SubmitFaTaskReq {
 
-//	@ApiModelProperty(value = "任务id")
-//	private Long firstArticleTaskId;
+	@ApiModelProperty(value = "任务id")
+	private Long taskId;
 
     @ApiModelProperty(value = "计划id")
     private Long bentelerPlanId;

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

@@ -763,8 +763,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
             searchFaTaskInfoReq.setUserId(req.getUserId());
         } else { // 2表示中断
-            searchFaTaskInfoReq.setStatus(0); // task状态为0初始化
+//            searchFaTaskInfoReq.setStatus(0); // task状态为0初始化
         }
+        searchFaTaskInfoReq.setTaskId(req.getTaskId());
         FirstArticleTask faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
 
         long firstArticleTaskId = 0;
@@ -846,8 +847,10 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
             searchFaTaskInfoReq.setUserId(req.getUserId());
         } else { // 2表示中断
-            searchFaTaskInfoReq.setStatus(0); // task状态为0初始化
+//            searchFaTaskInfoReq.setStatus(0); // task状态为0初始化 多个taskId的时候不行
         }
+        searchFaTaskInfoReq.setTaskId(req.getTaskId());
+        
         FirstArticleTask faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
         long firstArticleTaskId = 0;
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件

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

@@ -233,12 +233,16 @@
     <!-- 查询中断task，传bentelerPlanId、typeFlag、status=0初始化 -->
     <select id="getFaTaskInfo" resultType="com.factory.web.entity.fa.FirstArticleTask">
         SELECT fat.id,
-        fat.`status`,fat.first_article_calendar_id as firstArticleCalendarId
+        fat.`status`,
+        fat.first_article_calendar_id as firstArticleCalendarId
         FROM first_article_task fat,
         first_article_calendar fac
         WHERE fat.first_article_calendar_id = fac.id
         AND fac.benteler_plan_id = #{req.bentelerPlanId}
-        AND fat.type_flag = #{req.typeFlag}
+        AND fat.type_flag = #{req.typeFlag} 
+        <if test="req.taskId != null">
+        	and fat.id = #{req.taskId}
+        </if>
         <if test="req.userId != null">
             AND (fac.principal_one_id = #{req.userId} OR fac.principal_two_id = #{req.userId})
         </if>