接口-调整

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

@@ -196,12 +196,12 @@ public class FirstArticleController {
 		return firstArticleService.getFaCheckRecordList(req);
 	}
 	
-	@ApiOperation(value = "判断检验结果是否填写完成")
-	@PostMapping("/getFaAllCheckFlag")
-	@ApiOperationSupport(order = 19)
-	public ResponseBean<FaAllCheckFlagRes> getFaAllCheckFlag(@RequestBody SearchFaAllCheckFlagReq req) {
-		return ResponseBeanBuilder.ok(firstArticleService.getFaAllCheckFlag(req));
-	}
+//	@ApiOperation(value = "判断检验结果是否填写完成")
+//	@PostMapping("/getFaAllCheckFlag")
+//	@ApiOperationSupport(order = 19)
+//	public ResponseBean<FaAllCheckFlagRes> getFaAllCheckFlag(@RequestBody SearchFaAllCheckFlagReq req) {
+//		return ResponseBeanBuilder.ok(firstArticleService.getFaAllCheckFlag(req));
+//	}
 	
 	@ApiOperation(value = "取得用户列表")
 	@PostMapping("/getUserList")

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

@@ -223,15 +223,13 @@ public class PreventMistakeController {
 		return preventMistakeService.getAllWorkshopList(req);
 	}
 	
-	@ApiOperation(value = "判断检验结果是否填写完成")
-	@PostMapping("/getPmAllCheckFlag")
-	@ApiOperationSupport(order = 23)
-	public ResponseBean<PmAllCheckFlagRes> getPmAllCheckFlag(@RequestBody SearchPmAllCheckFlagReq req) {
-		return ResponseBeanBuilder.ok(preventMistakeService.getPmAllCheckFlag(req));
-	}
-	
-	
-	
+//	@ApiOperation(value = "判断检验结果是否填写完成")
+//	@PostMapping("/getPmAllCheckFlag")
+//	@ApiOperationSupport(order = 23)
+//	public ResponseBean<PmAllCheckFlagRes> getPmAllCheckFlag(@RequestBody SearchPmAllCheckFlagReq req) {
+//		return ResponseBeanBuilder.ok(preventMistakeService.getPmAllCheckFlag(req));
+//	}
+
 	@ApiOperation(value = "取得异常列表")
 	@PostMapping("/getAbnormalList")
 	@ApiOperationSupport(order = 24)

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

@@ -218,12 +218,12 @@ public interface FirstArticleService extends IService<BentelerPlan> {
      */
     public List<FirstArticleItemResult> getFaItemResultList(SearchFaItemResultListReq req);
     
-    /**
-     * 判断检验结果是否填写完成
-     * @param req
-     * @return 判断检验结果是否填写完成
-     */
-    public FaAllCheckFlagRes getFaAllCheckFlag(SearchFaAllCheckFlagReq req);
+//    /**
+//     * 判断检验结果是否填写完成
+//     * @param req
+//     * @return 判断检验结果是否填写完成
+//     */
+//    public FaAllCheckFlagRes getFaAllCheckFlag(SearchFaAllCheckFlagReq req);
     
     /**
      * 取得用户列表

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

@@ -515,13 +515,27 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     	
     	List<FirstArticleWorkshop> listRes = firstArticleMapper.getFaWorkshopListForPad(req);
     	
+    	SearchFaItemListForPadReq searchFaItemListReq = null;
     	SearchFaWsItemResultCountReq searchFaWsItemResultCountReq = null;
     	for (FirstArticleWorkshop firstArticleWorkshop : listRes) {
-    		searchFaWsItemResultCountReq = new SearchFaWsItemResultCountReq();
+    		/* 取得点检项目 */
+    		searchFaItemListReq = new SearchFaItemListForPadReq();
+    		searchFaItemListReq.setWorkshopId(firstArticleWorkshop.getId());
+    		searchFaItemListReq.setTypeFlag(req.getTypeFlag());
+        	List<FaItemListForPadRes> listResTemp = firstArticleMapper.getFaItemListForPad(searchFaItemListReq);
+        	/* 计算点检项目数 */
+        	int itemCount = 0;
+        	for (FaItemListForPadRes faItem : listResTemp) {
+        		int start = faItem.getSnoStart();
+        		int end = faItem.getSnoEnd();
+        		
+        		itemCount += (end - start + 1);
+        	}
+    		
+        	searchFaWsItemResultCountReq = new SearchFaWsItemResultCountReq();
     		searchFaWsItemResultCountReq.setFirstArticleTaskId(firstArticleTaskId);
     		searchFaWsItemResultCountReq.setWorkshopId(firstArticleWorkshop.getId());
-    		
-    		int itemCount = firstArticleMapper.getFaWsItemCount(searchFaWsItemResultCountReq);
+//    		int itemCount = firstArticleMapper.getFaWsItemCount(searchFaWsItemResultCountReq);
     		int itemResultCount = firstArticleMapper.getFaWsItemResultCount(searchFaWsItemResultCountReq);
     		if (itemCount == itemResultCount) {
     			firstArticleWorkshop.setAllCheckFlag(1);
@@ -567,22 +581,46 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     		/* 序号拆分（从1到10，就拆分成10条） */
     		int snoStart = faItemListForPadRes.getSnoStart();
     		int snoEnd = faItemListForPadRes.getSnoEnd();
+    		
+    		FaItemListForPadRes itemInfo = null;
     		for (int i = snoStart; i <= snoEnd; i++) {
-    			faItemListForPadRes.setSno(i);
+    			itemInfo = new FaItemListForPadRes();
+    			
+    			itemInfo.setSno(i);
+    			itemInfo.setId(faItemListForPadRes.getId());    
+    			itemInfo.setWorkshopId(faItemListForPadRes.getWorkshopId());
+    			itemInfo.setItemContent(faItemListForPadRes.getItemContent());    			
+    			itemInfo.setItemStandard(faItemListForPadRes.getItemStandard());
+    			itemInfo.setPrefix(faItemListForPadRes.getPrefix());    			
+    			itemInfo.setSnoStart(faItemListForPadRes.getSnoStart());
+    			itemInfo.setSnoEnd(faItemListForPadRes.getSnoEnd());  
+    			itemInfo.setValFlag(faItemListForPadRes.getValFlag());
+    			itemInfo.setValUp(faItemListForPadRes.getValUp());
+    			itemInfo.setValDown(faItemListForPadRes.getValDown());  
+    			itemInfo.setValOk(faItemListForPadRes.getValOk());    			
+    			itemInfo.setValDesc(faItemListForPadRes.getValDesc());
+    			itemInfo.setLevelInfo(faItemListForPadRes.getLevelInfo());    			
+    			itemInfo.setProductInfo(faItemListForPadRes.getProductInfo());
+    			itemInfo.setToolId(faItemListForPadRes.getToolId());
+    			itemInfo.setToolDesc(faItemListForPadRes.getToolDesc());
+    			itemInfo.setFirstFlag(faItemListForPadRes.getFirstFlag());
+    			itemInfo.setTwoHundredFlag(faItemListForPadRes.getTwoHundredFlag());    			
+    			itemInfo.setCatchFlag(faItemListForPadRes.getCatchFlag());
+    			itemInfo.setValUnit(faItemListForPadRes.getValUnit());
 
     			/* 取得检查结果 */
     			FirstArticleItemResult firstArticleItemResult = firstArticleItemResultService.getOne(Wrappers.<FirstArticleItemResult>lambdaQuery()
     	                .eq(FirstArticleItemResult::getFirstArticleTaskId, firstArticleTaskId)
-    	                .eq(FirstArticleItemResult::getFirstArticleItemId, faItemListForPadRes.getId())
-    	                .eq(FirstArticleItemResult::getSno, faItemListForPadRes.getSno()));
+    	                .eq(FirstArticleItemResult::getFirstArticleItemId, itemInfo.getId())
+    	                .eq(FirstArticleItemResult::getSno, itemInfo.getSno()));
     			if (firstArticleItemResult != null) {
-    				faItemListForPadRes.setResult(firstArticleItemResult.getResult());
-    				faItemListForPadRes.setValCheck(firstArticleItemResult.getVal());
-    				faItemListForPadRes.setValDescCheck(firstArticleItemResult.getValDesc());
-    				faItemListForPadRes.setToolDescCheck(firstArticleItemResult.getToolDesc());
+    				itemInfo.setResult(firstArticleItemResult.getResult());
+    				itemInfo.setValCheck(firstArticleItemResult.getVal());
+    				itemInfo.setValDescCheck(firstArticleItemResult.getValDesc());
+    				itemInfo.setToolDescCheck(firstArticleItemResult.getToolDesc());
     			}
 
-    			listRes.add(faItemListForPadRes);
+    			listRes.add(itemInfo);
     		}
     	}
 
@@ -682,7 +720,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
     		if (faTaskInfo == null) {
     			return ResponseBeanBuilder.fail("计划任务不存在！");
     		} else {
-    			if (faTaskInfo.getStatus() == 0) {
+    			if (faTaskInfo.getStatus() == 0 || faTaskInfo.getStatus() == 3) { // 首次提交和重检提交
     				firstArticleTaskId = faTaskInfo.getId();
     			} else {
     				return ResponseBeanBuilder.fail("该计划任务已处理！无需重复提交！");
@@ -970,50 +1008,50 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 		return faItemResultList;
     }
     
-    /**
-     * 判断检验结果是否填写完成
-     * @param req
-     * @return 检验结果是否填写完成
-     */
-	@Override
-	public FaAllCheckFlagRes getFaAllCheckFlag(SearchFaAllCheckFlagReq req) {
-		/* 取得task信息 */
-    	SearchFaTaskInfoReq searchFaTaskInfoReq = new SearchFaTaskInfoReq();
-    	searchFaTaskInfoReq.setBentelerPlanId(req.getBentelerPlanId());
-    	searchFaTaskInfoReq.setTypeFlag(req.getTypeFlag());
-    	
-    	FirstArticleTask faTaskInfo = null;
-    	if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
-    		searchFaTaskInfoReq.setUserId(req.getUserId());
-    		faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
-    	} else { // 2表示中断
-    		/* 取得中断最新的task */
-    		faTaskInfo = this.getFaTaskInfoCatchLatest(searchFaTaskInfoReq);
-    	}
-    	
-    	long firstArticleTaskId = 0;
-    	if (faTaskInfo != null) {
-    		firstArticleTaskId = faTaskInfo.getId();
-		}
-
-		SearchFaPlanReq searchFaPlanReq = new SearchFaPlanReq();
-		searchFaPlanReq.setBentelerPlanId(req.getBentelerPlanId());
-		int itemCount = firstArticleMapper.getFaItemCount(searchFaPlanReq);
-
-		SearchFaItemResultCountReq searchFaItemResultCountReq = new SearchFaItemResultCountReq();
-		searchFaItemResultCountReq.setBentelerPlanId(req.getBentelerPlanId());
-		searchFaItemResultCountReq.setFirstArticleTaskId(firstArticleTaskId);
-		int itemResultCount = firstArticleMapper.getFaItemResultCount(searchFaItemResultCountReq);
-
-		FaAllCheckFlagRes faAllCheckFlagRes = new FaAllCheckFlagRes();
-		if (itemCount == itemResultCount) {
-			faAllCheckFlagRes.setAllCheckFlag(1); // 全部完成
-		} else {
-			faAllCheckFlagRes.setAllCheckFlag(0); // 没完成
-		}
-
-		return faAllCheckFlagRes;
-	}
+//    /**
+//     * 判断检验结果是否填写完成
+//     * @param req
+//     * @return 检验结果是否填写完成
+//     */
+//	@Override
+//	public FaAllCheckFlagRes getFaAllCheckFlag(SearchFaAllCheckFlagReq req) {
+//		/* 取得task信息 */
+//    	SearchFaTaskInfoReq searchFaTaskInfoReq = new SearchFaTaskInfoReq();
+//    	searchFaTaskInfoReq.setBentelerPlanId(req.getBentelerPlanId());
+//    	searchFaTaskInfoReq.setTypeFlag(req.getTypeFlag());
+//    	
+//    	FirstArticleTask faTaskInfo = null;
+//    	if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
+//    		searchFaTaskInfoReq.setUserId(req.getUserId());
+//    		faTaskInfo = this.getFaTaskInfo(searchFaTaskInfoReq);
+//    	} else { // 2表示中断
+//    		/* 取得中断最新的task */
+//    		faTaskInfo = this.getFaTaskInfoCatchLatest(searchFaTaskInfoReq);
+//    	}
+//    	
+//    	long firstArticleTaskId = 0;
+//    	if (faTaskInfo != null) {
+//    		firstArticleTaskId = faTaskInfo.getId();
+//		}
+//
+//		SearchFaPlanReq searchFaPlanReq = new SearchFaPlanReq();
+//		searchFaPlanReq.setBentelerPlanId(req.getBentelerPlanId());
+//		int itemCount = firstArticleMapper.getFaItemCount(searchFaPlanReq);
+//
+//		SearchFaItemResultCountReq searchFaItemResultCountReq = new SearchFaItemResultCountReq();
+//		searchFaItemResultCountReq.setBentelerPlanId(req.getBentelerPlanId());
+//		searchFaItemResultCountReq.setFirstArticleTaskId(firstArticleTaskId);
+//		int itemResultCount = firstArticleMapper.getFaItemResultCount(searchFaItemResultCountReq);
+//
+//		FaAllCheckFlagRes faAllCheckFlagRes = new FaAllCheckFlagRes();
+//		if (itemCount == itemResultCount) {
+//			faAllCheckFlagRes.setAllCheckFlag(1); // 全部完成
+//		} else {
+//			faAllCheckFlagRes.setAllCheckFlag(0); // 没完成
+//		}
+//
+//		return faAllCheckFlagRes;
+//	}
 	
 	
 	/**

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

@@ -55,7 +55,7 @@
 			<if test="req.bentelerPlanName != null and req.bentelerPlanName != ''">
 		    AND bp.`name` LIKE CONCAT('%', #{req.bentelerPlanName}, '%')
 		    </if>
-		    <if test="req.planStatus != null and req.planStatus != ''">
+		    <if test="req.planStatus != null">
 		    AND ps.plan_status = #{req.planStatus}
 		    </if>
 		GROUP BY
@@ -64,11 +64,11 @@
     
     <!--取得Pad端首件计划列表 -->
     <select id="getFaPlanListForPad" resultType="com.factory.web.entity.fa.res.FaPlanListForPadRes">
-        SELECT fat.id AS onsite_task_id,
+        SELECT fat.id AS first_article_task_id,
 		       fat.`status`,
 			   fac.benteler_plan_id,
 			   bp.`name` AS benteler_plan_name,
-			   fac.id AS onsite_calendar_id,
+			   fac.id AS first_article_calendar_id,
 			   fac.type_flag
 		FROM   first_article_task fat,
 		       first_article_calendar fac,
@@ -85,7 +85,7 @@
 		<if test="req.type == 2"> <!-- 待重检（不放行） -->
 		AND    fat.`status` = 3
 		</if>
-		<if test="req.typeFlag != null and req.typeFlag != ''"><!-- 0表示首件 1表示200件 -->
+		<if test="req.typeFlag != null"><!-- 0表示首件 1表示200件 -->
 		AND    fac.type_flag = #{req.typeFlag}
 		</if>
 		AND    TO_DAYS(fat.task_time) = TO_DAYS(NOW())

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

@@ -55,7 +55,7 @@
 			<if test="req.bentelerPlanName != null and req.bentelerPlanName != ''">
 		    AND bp.`name` LIKE CONCAT('%', #{req.bentelerPlanName}, '%')
 		    </if>
-		    <if test="req.planStatus != null and req.planStatus != ''">
+		    <if test="req.planStatus != null">
 		    AND ps.plan_status = #{req.planStatus}
 		    </if>
 		GROUP BY