更新防错部分错误

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

@@ -178,14 +178,14 @@ public class PreventMistakeController {
 	@ApiOperation(value = "添加巡检项目检查结果")
 	@PostMapping("/addItemResult")
 	@ApiOperationSupport(order = 16)
-	public ResponseBean addItemResult(@RequestBody AddItemResultListReq req) {
+	public ResponseBean<Void> addItemResult(@RequestBody AddItemResultListReq req) {
 		return preventMistakeService.addItemResult(req);
 	}
 
 	@ApiOperation(value = "任务检查完后提交")
 	@PostMapping("/submitTask")
 	@ApiOperationSupport(order = 17)
-	public ResponseBean submitTask(@RequestBody SearchTaskReq req) {
+	public ResponseBean<Void> submitTask(@RequestBody SearchTaskReq req) {
 		return preventMistakeService.submitTask(req);
 	}
 

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

@@ -123,7 +123,7 @@ import lombok.extern.slf4j.Slf4j;
 @Transactional(rollbackFor = Exception.class)
 public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, BentelerPlan> implements FirstArticleService {
 
-    private static long ROLE_ID = -1;
+    private static long ROLE_ID = 6;
 
     @Autowired
     private FirstArticleMapper firstArticleMapper;

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

@@ -846,6 +846,9 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
         /* 添加新的检查结果 */
 //    	List<AddItemResultReq> addItemResultList = req.getAddItemResultList();
         for (AddItemResultReq addItemResult : addItemResultList) {
+        	if(addItemResult.getResult()==null) {//没有填写
+        		continue;
+        	}
             OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()
                     .onsiteTaskId(req.getOnsiteTaskId())
                     .onsiteItemId(addItemResult.getOnsiteItemId())

application-facade/src/main/java/com/factory/wx/service/PlanApprovalService.java

@@ -46,5 +46,5 @@ public interface PlanApprovalService {
      * @param planApprovalReq
      * @return
      */
-    ResponseBean approvalOperate(PlanApprovalReq planApprovalReq);
+    ResponseBean<Void> approvalOperate(PlanApprovalReq planApprovalReq);
 }

application-facade/src/main/java/com/factory/wx/service/impl/PlanApprovalServiceImpl.java

@@ -271,7 +271,7 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
         			planService.updateById(planUpdate);
         			if(plan.getPrevId()!=null) {
         				 planUpdate = BentelerPlan.builder()
-             					.id(planApprovalReq.getPlanId())
+             					.id(plan.getPrevId())
              					.status(PlanStatus.HISTORY.value)
              					.build();
              			planService.updateById(planUpdate);