首件、防错-接口-pad端重检，不带之前的检查结果，重建后，工作站绿

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -30,6 +30,7 @@ import com.factory.web.entity.fa.res.UserListRes;
 import com.factory.web.entity.pm.OnsiteApprovalPlan;
 import com.factory.web.entity.pm.req.PmPlanPauseFlagReq;
 import com.factory.web.entity.pm.req.SearchPmPlanReq;
+import com.factory.web.entity.pm.req.SearchTaskReq;
 import com.factory.web.service.fa.FirstArticleService;
 import com.factory.web.service.pm.PreventMistakeService;
 
@@ -222,5 +223,13 @@ public class FirstArticleController {
 	public ResponseBean<List<FaCalendarRes>> getFaCalendarList(@RequestBody SearchFaCalendarReq req) {
 		return ResponseBeanBuilder.ok(firstArticleService.getFaCalendarList(req));
 	}
+	
+	@ApiOperation(value = "重检前清空之前的点检结果")
+	@PostMapping("/setFaRepeatResult")
+	@ApiOperationSupport(order = 22)
+	public ResponseBean setFaRepeatResult(@RequestBody SearchFaTaskReq req) {
+		firstArticleService.setFaRepeatResult(req.getFirstArticleTaskId());
+		return ResponseBeanBuilder.ok();
+	}
 
 }

application-facade/src/main/java/com/factory/controller/web/PreventMistakeController.java

@@ -235,6 +235,14 @@ public class PreventMistakeController {
 	public ResponseBean<List<AbnormalTaskInfoRes>> getAbnormalList(@RequestBody SearchAbnormalListReq req) {
 		return preventMistakeService.getAbnormalList(req);
 	}
+	
+	@ApiOperation(value = "重检前清空之前的点检结果")
+	@PostMapping("/setPmRepeatResult")
+	@ApiOperationSupport(order = 25)
+	public ResponseBean setPmRepeatResult(@RequestBody SearchTaskReq req) {
+		preventMistakeService.setPmRepeatResult(req.getOnsiteTaskId());
+		return ResponseBeanBuilder.ok();
+	}
 
 	// 计划审批、任务审批，都在小程序端做
 }

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

@@ -31,4 +31,7 @@ public class FaWorkshopNoGoListRes implements Serializable {
 	@ApiModelProperty(value = "工作站名称")
 	private String wsName;
 	
+	@ApiModelProperty(value = "0没完成 1全部完成")
+	private Integer allCheckFlag;
+	
 }

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

@@ -31,4 +31,7 @@ public class PmWorkshopNoGoListRes implements Serializable {
 	@ApiModelProperty(value = "工作站名称")
 	private String wsName;
 	
+	@ApiModelProperty(value = "0没完成 1全部完成")
+	private Integer allCheckFlag;
+	
 }

application-facade/src/main/java/com/factory/web/mapper/fa/FirstArticleMapper.java

@@ -164,4 +164,11 @@ public interface FirstArticleMapper extends BaseMapper<BentelerPlan> {
      */
     public List<FaCalendarRes> getFaCalendarList(@Param("req") SearchFaCalendarReq req);
     
+    /**
+     * 取得重检项目下，未完成重检的数量
+     * @param req
+     * @return 未完成重检的数量
+     */
+    public int getFaRepeatItemResultCount(@Param("req") SearchFaWsItemResultCountReq req);
+    
 }

application-facade/src/main/java/com/factory/web/mapper/pm/PreventMistakeMapper.java

@@ -217,8 +217,12 @@ public interface PreventMistakeMapper extends BaseMapper<BentelerPlan> {
      * @return PAD端工作站
      */
     public List<OnsiteWorkshop> getPmWorkshopListForPad(@Param("req") SearchPmAllCheckFlagReq req);
-    
-    
-    
+
+    /**
+     * 取得重检项目下，未完成重检的数量
+     * @param req
+     * @return 未完成重检的数量
+     */
+    public int getPmRepeatItemResultCount(@Param("req") SearchPmWsAllCheckFlagReq req);
     
 }

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

@@ -246,4 +246,12 @@ public interface FirstArticleService extends IService<BentelerPlan> {
 	ResponseBean<FileRes> exportFaCheckRecordList(SearchFaCheckRecordListReq req);
 
 	ResponseBean<FileRes> exportInitialPlanDetails(exportInitialPlanDetailsReq req);
+	
+	/**
+     * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
+     *
+     * @param firstArticleTaskId
+     * @return
+     */
+    public void setFaRepeatResult(long firstArticleTaskId);
 }

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

@@ -965,6 +965,19 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     @Override
     public ResponseBean<List<FaWorkshopNoGoListRes>> getFaWorkshopNoGoList(SearchFaWorkshopNoGoListReq req) {
         List<FaWorkshopNoGoListRes> faWorkshopNoGoList = firstArticleMapper.getFaWorkshopNoGoList(req);
+        SearchFaWsItemResultCountReq searchFaWsItemResultCountReq = null;
+        for (FaWorkshopNoGoListRes faWorkshop : faWorkshopNoGoList) {
+        	searchFaWsItemResultCountReq = new SearchFaWsItemResultCountReq();
+            searchFaWsItemResultCountReq.setFirstArticleTaskId(req.getFirstArticleTaskId());
+            searchFaWsItemResultCountReq.setWorkshopId(faWorkshop.getWorkshopId());
+            int itemResultCount = firstArticleMapper.getFaRepeatItemResultCount(searchFaWsItemResultCountReq);
+            if (itemResultCount == 0) {
+            	faWorkshop.setAllCheckFlag(1);
+            } else {
+            	faWorkshop.setAllCheckFlag(0);
+            }
+        }
+        
         return ResponseBeanBuilder.ok(faWorkshopNoGoList, Function.identity());
     }
 
@@ -1494,6 +1507,24 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         List<FaCalendarRes> faCalendarList = firstArticleMapper.getFaCalendarList(req);
         return faCalendarList;
     }
+    
+    
+    /**
+     * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
+     *
+     * @param firstArticleTaskId
+     * @return
+     */
+    @Override
+    public void setFaRepeatResult(long firstArticleTaskId) {
+    	LambdaUpdateWrapper<FirstArticleItemResult> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId)
+                .eq(FirstArticleItemResult::getResult, 1)
+                .set(FirstArticleItemResult::getResult, -1);
+        firstArticleItemResultService.update(lambdaUpdateWrapper);
+    }
+    
+    
 
     /**
      * Object转成byte[]

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

@@ -1016,6 +1016,22 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	@Override
 	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmWorkshopNoGoListReq req) {
 		List<PmWorkshopNoGoListRes> pmWorkshopNoGoList = preventMistakeMapper.getPmWorkshopNoGoList(req);
+		
+		SearchPmWsAllCheckFlagReq searchPmWsAllCheckFlagReq = null;
+		for (PmWorkshopNoGoListRes pmWorkshop : pmWorkshopNoGoList) {
+			searchPmWsAllCheckFlagReq = new SearchPmWsAllCheckFlagReq();
+			searchPmWsAllCheckFlagReq.setOnsiteTaskId(req.getOnsiteTaskId());
+			searchPmWsAllCheckFlagReq.setWorkshopId(pmWorkshop.getWorkshopId());
+			searchPmWsAllCheckFlagReq.setTypeFlag(req.getTypeFlag());   		
+
+			int itemResultCount = preventMistakeMapper.getPmRepeatItemResultCount(searchPmWsAllCheckFlagReq);
+			if (itemResultCount == 0) {
+				pmWorkshop.setAllCheckFlag(1);
+			} else {
+				pmWorkshop.setAllCheckFlag(0);
+			}
+		}
+
     	return ResponseBeanBuilder.ok(pmWorkshopNoGoList, Function.identity());
 	}
 
@@ -1305,6 +1321,23 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		List<AbnormalItemResultRes> abnormalItemResultList = preventMistakeMapper.getFaAbnormalItemResultList(searchReq);
 	    return abnormalItemResultList;
 	}
+	
+	
+	/**
+     * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
+     *
+     * @param onsiteTaskId
+     * @return
+     */
+    @Override
+    public void setPmRepeatResult(long onsiteTaskId) {
+    	LambdaUpdateWrapper<OnsiteItemResult> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(OnsiteItemResult::getOnsiteTaskId, onsiteTaskId)
+                .eq(OnsiteItemResult::getResult, 1)
+                .set(OnsiteItemResult::getResult, -1);
+        onsiteItemResultService.update(lambdaUpdateWrapper);
+    }
+    
 
 
     /**

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

@@ -305,5 +305,13 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @return 异常列表
 	 */
 	public ResponseBean<List<AbnormalTaskInfoRes>> getAbnormalList(SearchAbnormalListReq req);
+	
+	/**
+     * task二级审批不通过的，即为重检，此时将点检结果item_result为不通过的1都改成成-1，这样重检时相当于重新开始，没有之前首次点检的结果
+     *
+     * @param onsiteTaskId
+     * @return
+     */
+    public void setPmRepeatResult(long onsiteTaskId);
 
 }

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

@@ -470,4 +470,16 @@
 
     </select>
     
+    <!-- 取得重检项目下（result_bak = 1），未完成重检（result = -1）的item_result数量，如果重检了result会变成0或1 -->
+	<select id="getFaRepeatItemResultCount" resultType="int">
+	    SELECT  COUNT(fair.id)
+		FROM    first_article_item_result fair,
+				first_article_item fai
+		WHERE   fair.first_article_item_id = fai.id
+		AND     fair.result_bak = 1
+		AND     fair.result = -1
+		AND     fai.workshop_id = #{req.workshopId}
+		AND     fair.first_article_task_id = #{req.firstArticleTaskId}
+	</select>
+    
 </mapper>

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

@@ -571,5 +571,18 @@
 		AND     ow.benteler_plan_id = #{req.bentelerPlanId}
 		AND     oi.type_flag = #{req.typeFlag}
     </select>
+    
+    <!-- 取得重检项目下（result_bak = 1），未完成重检（result = -1）的item_result数量，如果重检了result会变成0或1 -->
+	<select id="getPmRepeatItemResultCount" resultType="int">
+	    SELECT  COUNT(oir.id)
+		FROM    onsite_item_result oir,
+				onsite_item oi
+		WHERE   oir.onsite_item_id = oi.id
+		AND     oir.result_bak = 1
+		AND     oir.result = -1
+		AND     oi.workshop_id = #{req.workshopId}
+		AND     oir.onsite_task_id = #{req.onsiteTaskId}
+		AND     oi.type_flag = #{req.typeFlag}
+	</select>
 
 </mapper>