接口-调整-PAD端重检，修改点检想，未提交前，仍然展示之前的不通过的工作站和记录

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

@@ -46,6 +46,9 @@ public class FirstArticleItemResult implements Serializable {
 
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
+	
+	@ApiModelProperty(value = "task整体提交时，备份result字段的值。 0通过 1巡检不通过 2没有巡检")
+	private Integer resultBak;
 
 	@TableField(fill = FieldFill.INSERT)
 	@ApiModelProperty(value = "创建人")

application-facade/src/main/java/com/factory/web/entity/pm/OnsiteItemResult.java

@@ -1,7 +1,6 @@
 package com.factory.web.entity.pm;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -42,6 +41,9 @@ public class OnsiteItemResult implements Serializable {
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;
 	
+	@ApiModelProperty(value = "task整体提交时，备份result字段的值。 0通过 1巡检不通过 2没有巡检")
+	private Integer resultBak;
+	
 	@ApiModelProperty(value = "异常信息")
 	private String abnormal;
 	

application-facade/src/main/java/com/factory/web/entity/pm/req/EditItemResultListReq.java

@@ -25,8 +25,8 @@ import lombok.NoArgsConstructor;
 @ApiModel("")
 public class EditItemResultListReq {
 	
-	@ApiModelProperty(value = "任务id")
-	private Long onsiteTaskId;
+//	@ApiModelProperty(value = "任务id")
+//	private Long onsiteTaskId;
 	
 //	@ApiModelProperty(value = "工作站id")
 //	private Long workshopId;

application-facade/src/main/java/com/factory/web/entity/pm/req/EditItemResultReq.java

@@ -22,9 +22,12 @@ import lombok.NoArgsConstructor;
 @JsonInclude()
 @ApiModel("")
 public class EditItemResultReq {
+	
+	@ApiModelProperty(value = "检查结果id")
+	private Long id;
 
-	@ApiModelProperty(value = "巡检项目id")
-	private Long onsiteItemId;
+//	@ApiModelProperty(value = "巡检项目id")
+//	private Long onsiteItemId;
 
 	@ApiModelProperty(value = "0通过 1巡检不通过 2没有巡检")
 	private Integer result;

application-facade/src/main/java/com/factory/web/entity/pm/res/PmItemNoGoListRes.java

@@ -25,6 +25,9 @@ import lombok.NoArgsConstructor;
 @JsonInclude()
 @ApiModel("")
 public class PmItemNoGoListRes implements Serializable {
+	
+	@ApiModelProperty(value = "检查结果id")
+	private Long id;
 
 	@ApiModelProperty(value = "巡检项目id")
 	private Long onsiteItemId;

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

@@ -861,6 +861,15 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         /* 取得task下的所有条目检查结果 */
         List<FirstArticleItemResult> firstArticleItemResultList = firstArticleItemResultService.list(Wrappers.<FirstArticleItemResult>lambdaQuery()
                 .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId));
+        
+        /* task提交时，备份result到resultBak */
+        for (FirstArticleItemResult firstArticleItemResult : firstArticleItemResultList) {
+        	FirstArticleItemResult fair = FirstArticleItemResult.builder()
+                    .id(firstArticleItemResult.getId())
+                    .resultBak(firstArticleItemResult.getResult())
+                    .build();
+        	firstArticleItemResultService.updateById(fair);
+        }
 
         boolean flag = true; // true表示巡检项目都通过，false表示巡检项目有不通过的
         for (FirstArticleItemResult firstArticleItemResult : firstArticleItemResultList) {

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -23,7 +23,9 @@ import com.factory.base.entity.aggregates.ResponseBean;
 import com.factory.base.entity.enumPo.PlanType;
 import com.factory.base.entity.po.benteler.BentelerPlan;
 import com.factory.base.util.res.ResponseBeanBuilder;
+import com.factory.web.entity.fa.FirstArticleItemResult;
 import com.factory.web.entity.fa.FirstArticleWorkshop;
+import com.factory.web.entity.fa.req.EditFaItemResultReq;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
 import com.factory.web.entity.pm.OnsiteApprovalTask;
 import com.factory.web.entity.pm.OnsiteCalendar;
@@ -883,6 +885,16 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		/* 取得task下的所有条目检查结果 */
 		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
                 .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
+		
+		/* task提交时，备份result到resultBak */
+        for (OnsiteItemResult onsiteItemResult : onsiteItemResultList) {
+        	OnsiteItemResult oir = OnsiteItemResult.builder()
+                    .id(onsiteItemResult.getId())
+                    .resultBak(onsiteItemResult.getResult())
+                    .build();
+        	onsiteItemResultService.updateById(oir);
+        }
+		
 		boolean flag = true; // true表示巡检项目都通过，false表示巡检项目有不通过的
 		for (OnsiteItemResult onsiteItemResult : onsiteItemResultList) {
 			if (onsiteItemResult.getResult() == 1) {
@@ -1008,44 +1020,15 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 */
 	@Override
 	public ResponseBean editItemResult(EditItemResultListReq req) {
-//		/* 任务和巡检结果记录历史 */
-//		PmTaskRes pmTaskRes = new PmTaskRes();
-//		OnsiteTask onsiteTask = onsiteTaskService.getById(req.getOnsiteTaskId());
-//		pmTaskRes.setOnsiteTaskId(onsiteTask.getId());
-//		pmTaskRes.setOnsiteCalendarId(onsiteTask.getOnsiteCalendarId());
-//		pmTaskRes.setStatus(onsiteTask.getStatus());
-//		pmTaskRes.setTaskTime(onsiteTask.getTaskTime());
-//		pmTaskRes.setRemindTaskFlag(onsiteTask.getRemindTaskFlag());
-//		pmTaskRes.setRemindNoworkFalg(onsiteTask.getRemindNoworkFalg());
-//		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
-//                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
-//		pmTaskRes.setOnsiteItemResultList(onsiteItemResultList);
-//
-//		try {
-//			OnsiteTaskHisBlob onsiteTaskHisBlob = OnsiteTaskHisBlob.builder()
-//					.onsiteTaskId(req.getOnsiteTaskId())
-//					.hisContent(this.objectToByteArray(pmTaskRes))
-//					.build();
-//			onsiteTaskHisBlobService.save(onsiteTaskHisBlob);
-//		} catch (Exception e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-
 		/* 更新巡检项目检查结果 */
 		List<EditItemResultReq> editItemResultList = req.getEditItemResultList();
     	for (EditItemResultReq editItemResult : editItemResultList) {
-    		onsiteItemResultService.remove(Wrappers.<OnsiteItemResult>lambdaQuery()
-                    .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId())
-                    .eq(OnsiteItemResult::getOnsiteItemId, editItemResult.getOnsiteItemId()));
-
     		OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()
-    				.onsiteTaskId(req.getOnsiteTaskId())
-    				.onsiteItemId(editItemResult.getOnsiteItemId())
+    				.id(editItemResult.getId())
     				.result(editItemResult.getResult())
     				.abnormal(editItemResult.getAbnormal())
     				.build();
-    		onsiteItemResultService.save(onsiteItemResult);
+    		onsiteItemResultService.updateById(onsiteItemResult);
     	}
 
 		return ResponseBeanBuilder.ok();

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

@@ -167,7 +167,7 @@
 				first_article_workshop faw
 		WHERE   fair.first_article_item_id = fai.id
 		AND     fai.workshop_id = faw.id
-		AND     fair.result = 1
+		AND     fair.result_bak = 1
 		AND     faw.benteler_plan_id = #{req.bentelerPlanId}
 		AND     fair.first_article_task_id = #{req.firstArticleTaskId}
     </select>
@@ -212,7 +212,7 @@
 			fair.first_article_task_id = fat.id 
 			AND fair.first_article_item_id = fai.id 
 			AND fat.`status` = 3 
-			AND fair.result = 1 
+			AND fair.result_bak = 1 
 			AND fai.workshop_id = #{req.workshopId}
 			AND fair.first_article_task_id = #{req.firstArticleTaskId}
     </select>

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

@@ -243,7 +243,7 @@
 				onsite_workshop ow
 		WHERE   oir.onsite_item_id = oi.id
 		AND     oi.workshop_id = ow.id
-		AND     oir.result = 1
+		AND     oir.result_bak = 1
 		AND     ow.benteler_plan_id = #{req.bentelerPlanId}
 		AND     oir.onsite_task_id = #{req.onsiteTaskId}
 		AND     oi.type_flag = #{req.typeFlag}
@@ -252,6 +252,7 @@
     <!-- 取得不放行任务对应的点检项目 -->
     <select id="getPmItemNoGoList" resultType="com.factory.web.entity.pm.res.PmItemNoGoListRes">
         SELECT
+            oir.id,
 			oir.onsite_item_id,
 			oi.item_content,
 			oir.result,
@@ -264,7 +265,7 @@
 			oir.onsite_task_id = ot.id
 			AND oir.onsite_item_id = oi.id
 			AND ot.`status` = 3
-			AND oir.result = 1
+			AND oir.result_bak = 1
 			AND oi.workshop_id = #{req.workshopId}
 			AND oir.onsite_task_id = #{req.onsiteTaskId}
 			AND oi.type_flag = #{req.typeFlag}