首件-接口-调整

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

@@ -42,11 +42,9 @@ import com.factory.web.entity.fa.req.FirstArticleCalendarReq;
 import com.factory.web.entity.fa.req.FirstArticleItemReq;
 import com.factory.web.entity.fa.req.FirstArticleWorkshopReq;
 import com.factory.web.entity.fa.req.SearchALLPlanListReq;
-import com.factory.web.entity.fa.req.SearchFaAllCheckFlagReq;
 import com.factory.web.entity.fa.req.SearchFaCheckRecordListReq;
 import com.factory.web.entity.fa.req.SearchFaItemListForPadReq;
 import com.factory.web.entity.fa.req.SearchFaItemNoGoListReq;
-import com.factory.web.entity.fa.req.SearchFaItemResultCountReq;
 import com.factory.web.entity.fa.req.SearchFaItemResultListReq;
 import com.factory.web.entity.fa.req.SearchFaPlanCheckListReq;
 import com.factory.web.entity.fa.req.SearchFaPlanListForPadReq;
@@ -58,7 +56,6 @@ import com.factory.web.entity.fa.req.SearchFaWorkshopNoGoListReq;
 import com.factory.web.entity.fa.req.SearchFaWsItemResultCountReq;
 import com.factory.web.entity.fa.req.SearchUserListReq;
 import com.factory.web.entity.fa.req.SubmitFaTaskReq;
-import com.factory.web.entity.fa.res.FaAllCheckFlagRes;
 import com.factory.web.entity.fa.res.FaCheckRecordListRes;
 import com.factory.web.entity.fa.res.FaItemListForPadRes;
 import com.factory.web.entity.fa.res.FaItemNoGoListRes;
@@ -681,12 +678,19 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     		}
     	}
 
+    	List<AddFaItemResultReq> addFaItemResultList = req.getAddFaItemResultList();
     	/* 删除上一次保存结果 */
+    	List<Long> firstArticleItemIdList = new ArrayList<Long>();
+        for (AddFaItemResultReq itemResult : addFaItemResultList) {
+        	firstArticleItemIdList.add(itemResult.getFirstArticleItemId());
+        }
+    	
     	firstArticleItemResultService.remove(Wrappers.<FirstArticleItemResult>lambdaQuery()
-                .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId));
+                .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId)
+                .in(FirstArticleItemResult::getFirstArticleItemId, firstArticleItemIdList));
     	
     	/* 添加新的检查结果 */
-    	List<AddFaItemResultReq> addFaItemResultList = req.getAddFaItemResultList();
+//    	List<AddFaItemResultReq> addFaItemResultList = req.getAddFaItemResultList();
     	for (AddFaItemResultReq addFaItemResult : addFaItemResultList) {
     		FirstArticleItemResult firstArticleItemResult = FirstArticleItemResult.builder()
     				.firstArticleTaskId(firstArticleTaskId)

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

@@ -739,12 +739,19 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      */
     @Override
 	public ResponseBean addItemResult(AddItemResultListReq req) {
-    	/* 删除上一次保存结果 */
+        List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
+        
+        /* 删除上一次保存结果 */
+        List<Long> onsiteItemIdList = new ArrayList<Long>();
+        for (AddItemResultReq itemResult : addItemResultList) {
+        	onsiteItemIdList.add(itemResult.getOnsiteItemId());
+        }
     	onsiteItemResultService.remove(Wrappers.<OnsiteItemResult>lambdaQuery()
-                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
+                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId())
+                .in(OnsiteItemResult::getOnsiteItemId, onsiteItemIdList));
 
     	/* 添加新的检查结果 */
-    	List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
+//    	List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
     	for (AddItemResultReq addItemResult : addItemResultList) {
     		OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()
     				.onsiteTaskId(req.getOnsiteTaskId())