Merge remote-tracking branch 'origin/master'

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

@@ -679,6 +679,11 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     		}
     	}
 
+    	/* 删除上一次保存结果 */
+    	firstArticleItemResultService.remove(Wrappers.<FirstArticleItemResult>lambdaQuery()
+                .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId));
+    	
+    	/* 添加新的检查结果 */
     	List<AddFaItemResultReq> addFaItemResultList = req.getAddFaItemResultList();
     	for (AddFaItemResultReq addFaItemResult : addFaItemResultList) {
     		FirstArticleItemResult firstArticleItemResult = FirstArticleItemResult.builder()

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

@@ -96,8 +96,6 @@ import com.factory.web.service.pm.OnsiteTitleBlobService;
 import com.factory.web.service.pm.OnsiteWorkshopService;
 import com.factory.web.service.pm.PreventMistakeService;
 
-import io.swagger.annotations.ApiModelProperty;
-
 
 /**
  * 防错计划
@@ -700,6 +698,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      */
     @Override
 	public ResponseBean addItemResult(AddItemResultListReq req) {
+    	/* 删除上一次保存结果 */
+    	onsiteItemResultService.remove(Wrappers.<OnsiteItemResult>lambdaQuery()
+                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
+    	
+    	/* 添加新的检查结果 */
     	List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
     	for (AddItemResultReq addItemResult : addItemResultList) {
     		OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()