防错-接口

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -25,7 +26,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteApprovalPlan {
+public class OnsiteApprovalPlan implements Serializable {
 
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "计划审批id")

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteApprovalTask {
+public class OnsiteApprovalTask implements Serializable {
 
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "任务审批id")

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteCalendar {
+public class OnsiteCalendar implements Serializable {
 
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "规则id")

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -25,7 +26,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsitePlanHisBlob {
+public class OnsitePlanHisBlob implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "历史id")

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -23,7 +24,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteTask {
+public class OnsiteTask implements Serializable {
 
 	@TableId(type = IdType.AUTO)
 	@ApiModelProperty(value = "任务id")

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -25,7 +26,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteTaskHisBlob {
+public class OnsiteTaskHisBlob implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "历史id")

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm;
 
+import java.io.Serializable;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -22,7 +24,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class OnsiteTitleBlob {
+public class OnsiteTitleBlob implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "表头id")

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class ApprovalUserRes {
+public class ApprovalUserRes implements Serializable {
 
 	@ApiModelProperty(value = "审批人用户ID")
 	private Long userId;

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -23,7 +24,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmCheckListRes {
+public class PmCheckListRes implements Serializable {
 
 	@ApiModelProperty(value = "计划ID")
 	private Long bentelerPlanId;

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmItemNoGoListRes {
+public class PmItemNoGoListRes implements Serializable {
 
 	@ApiModelProperty(value = "巡检项目id")
 	private Long onsiteItemId;

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmItemResultListRes {
+public class PmItemResultListRes implements Serializable {
 
 	@ApiModelProperty(value = "工作站id")
 	private Long workshopId;

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmPlanListForPadRes {
+public class PmPlanListForPadRes implements Serializable {
 	
 	@ApiModelProperty(value = "任务ID")
 	private Long onsiteTaskId;
@@ -37,5 +39,8 @@ public class PmPlanListForPadRes {
 
 	@ApiModelProperty(value = "规则id")
 	private Long onsiteCalendarId;
+	
+	@ApiModelProperty(value = "0日巡检  1周巡检  2月巡检")
+	private Integer typeFlag;
 
 }

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

@@ -1,5 +1,6 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -23,7 +24,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmPlanListRes {
+public class PmPlanListRes implements Serializable {
 
 	@ApiModelProperty(value = "计划ID")
 	private Long bentelerPlanId;

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmTaskListRes {
+public class PmTaskListRes implements Serializable {
 
 	@ApiModelProperty(value = "计划ID")
 	private Long bentelerPlanId;

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

@@ -1,5 +1,7 @@
 package com.factory.web.entity.pm.res;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.swagger.annotations.ApiModel;
@@ -21,7 +23,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @JsonInclude()
 @ApiModel("")
-public class PmWorkshopNoGoListRes {
+public class PmWorkshopNoGoListRes implements Serializable {
 
 	@ApiModelProperty(value = "工作站id")
 	private Long workshopId;

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

@@ -199,14 +199,16 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 		/* 取得审批人 approvalLevel=1级审批 type=1计划审批 */
 		ApprovalUserRes approvalUserRes = this.getApprovalUserInfo(1, 1);
-		/* 添加计划一级审批 */
-		OnsiteApprovalPlan onsiteApprovalPlan = OnsiteApprovalPlan.builder()
-				.bentelerPlanId(plan.getId())
-				.approvalLevel(1) // 1级审批
-				.approvalUserId(approvalUserRes.getUserId())
-				.status(0) // 0未审批
-				.build();
-		onsiteApprovalPlanService.save(onsiteApprovalPlan);
+		if (approvalUserRes != null) {
+			/* 添加计划一级审批 */
+			OnsiteApprovalPlan onsiteApprovalPlan = OnsiteApprovalPlan.builder()
+					.bentelerPlanId(plan.getId())
+					.approvalLevel(1) // 1级审批
+					.approvalUserId(approvalUserRes.getUserId())
+					.status(0) // 0未审批
+					.build();
+			onsiteApprovalPlanService.save(onsiteApprovalPlan);
+		}
 
 		return ResponseBeanBuilder.ok();
 	}
@@ -385,32 +387,36 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      */
 	@Override
 	public ResponseBean editPmPlan(EditPmPlanReq req) {
-		/* 校验计划名称是否存在 */
-		if (this.checkPlanNameExist(req.getBentelerPlanName())) {
-			return ResponseBeanBuilder.fail("计划名称已存在");
-		}
-
-		/* 将之前的plan所有信息记到his中（暂时没记审批信息） */
-		int count = onsiteApprovalPlanService.count(
-				Wrappers.<OnsiteApprovalPlan> lambdaQuery()
-				.eq(OnsiteApprovalPlan::getBentelerPlanId, req.getBentelerPlanId())
-				.eq(OnsiteApprovalPlan::getStatus, 2));
-		if (count > 0) { // 当前审批状态为驳回
-			SearchPmPlanReq searchPmPlanReq = new SearchPmPlanReq();
-			searchPmPlanReq.setBentelerPlanId(req.getBentelerPlanId());
-			PmPlanRes pmPlanRes = this.getPmPlan(searchPmPlanReq);
-			try {
-				OnsitePlanHisBlob onsitePlanHisBlob = OnsitePlanHisBlob.builder()
-						.bentelerPlanId(req.getBentelerPlanId())
-						.hisContent(this.objectToByteArray(pmPlanRes))
-						.build();
-				onsitePlanHisBlobService.save(onsitePlanHisBlob);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		
+		BentelerPlan oldPlan = planService.getById(req.getBentelerPlanId());
+		if (!req.getBentelerPlanName().equals(oldPlan.getName())) {
+			/* 校验计划名称是否存在 */
+			if (this.checkPlanNameExist(req.getBentelerPlanName())) {
+				return ResponseBeanBuilder.fail("计划名称已存在");
 			}
 		}
 
+//		/* 将之前的plan所有信息记到his中（暂时没记审批信息） */
+//		int count = onsiteApprovalPlanService.count(
+//				Wrappers.<OnsiteApprovalPlan> lambdaQuery()
+//				.eq(OnsiteApprovalPlan::getBentelerPlanId, req.getBentelerPlanId())
+//				.eq(OnsiteApprovalPlan::getStatus, 2));
+//		if (count > 0) { // 当前审批状态为驳回
+//			SearchPmPlanReq searchPmPlanReq = new SearchPmPlanReq();
+//			searchPmPlanReq.setBentelerPlanId(req.getBentelerPlanId());
+//			PmPlanRes pmPlanRes = this.getPmPlan(searchPmPlanReq);
+//			try {
+//				OnsitePlanHisBlob onsitePlanHisBlob = OnsitePlanHisBlob.builder()
+//						.bentelerPlanId(req.getBentelerPlanId())
+//						.hisContent(this.objectToByteArray(pmPlanRes))
+//						.build();
+//				onsitePlanHisBlobService.save(onsitePlanHisBlob);
+//			} catch (Exception e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//		}
+
 		/* 修改放错计划 */
 		// TODO 计划生效日期
 		BentelerPlan plan = BentelerPlan.builder()
@@ -461,7 +467,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
                 .in(OnsiteItem::getWorkshopId, workshopIdList));
         /* 删除工作站 */
         onsiteWorkshopService.remove(Wrappers.<OnsiteWorkshop>lambdaQuery()
-                .in(OnsiteWorkshop::getBentelerPlanId, plan.getId()));
+                .eq(OnsiteWorkshop::getBentelerPlanId, plan.getId()));
         /* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 		for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
@@ -490,17 +496,19 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 
 		/* 删除之前的审批记录 */
 		onsiteApprovalPlanService.remove(Wrappers.<OnsiteApprovalPlan>lambdaQuery()
-                .in(OnsiteApprovalPlan::getBentelerPlanId, plan.getId()));
+                .eq(OnsiteApprovalPlan::getBentelerPlanId, plan.getId()));
 		/* 取得审批人 approvalLevel=1级审批 type=1计划审批 */
 		ApprovalUserRes approvalUserRes = this.getApprovalUserInfo(1, 1);
-		/* 添加计划一级审批 */
-		OnsiteApprovalPlan onsiteApprovalPlan = OnsiteApprovalPlan.builder()
-				.bentelerPlanId(plan.getId())
-				.approvalLevel(1) // 1级审批
-				.approvalUserId(approvalUserRes.getUserId())
-				.status(0) // 0未审批
-				.build();
-		onsiteApprovalPlanService.save(onsiteApprovalPlan);
+		if (approvalUserRes != null) {
+			/* 添加计划一级审批 */
+			OnsiteApprovalPlan onsiteApprovalPlan = OnsiteApprovalPlan.builder()
+					.bentelerPlanId(plan.getId())
+					.approvalLevel(1) // 1级审批
+					.approvalUserId(approvalUserRes.getUserId())
+					.status(0) // 0未审批
+					.build();
+			onsiteApprovalPlanService.save(onsiteApprovalPlan);
+		}
 		
 		return ResponseBeanBuilder.ok();
 	}
@@ -639,6 +647,10 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.build();
 			onsiteTaskService.updateById(onsiteTask);
 			
+			/* 删除之前的审批记录 */
+			onsiteApprovalTaskService.remove(Wrappers.<OnsiteApprovalTask>lambdaQuery()
+	                .eq(OnsiteApprovalTask::getOnsiteTaskId, onsiteTask.getId()));
+			
 			/* 取得审批人 approvalLevel=1级审批 type=3防错任务审批 */
 			ApprovalUserRes approvalUserRes = this.getApprovalUserInfo(1, 3);
 			if (approvalUserRes != null) {
@@ -673,7 +685,8 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
      * @param type 1计划审批  2首件任务审批  3防错任务审批
      * @return 审批人
      */
-    private ApprovalUserRes getApprovalUserInfo(int approvalLevel, int type) {
+	@Override
+    public ApprovalUserRes getApprovalUserInfo(int approvalLevel, int type) {
     	SearchApprovalUserReq searchApprovalUserReq = new SearchApprovalUserReq();
 		searchApprovalUserReq.setApprovalLevel(approvalLevel); // 审批级别
 		searchApprovalUserReq.setType(type); // 审批规则类型
@@ -687,6 +700,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @param req
 	 * @return 每频次点检信息
 	 */
+	@Override
 	public ResponseBean<List<PmCheckListRes>> getPmCheckList(SearchPmPlanReq req) {
 		List<PmCheckListRes> pmCheckList = preventMistakeMapper.getPmCheckList(req);
     	return ResponseBeanBuilder.ok(pmCheckList, Function.identity());
@@ -698,6 +712,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @param req
 	 * @return 不放行任务对应的工作站
 	 */
+	@Override
 	public ResponseBean<List<PmWorkshopNoGoListRes>> getPmWorkshopNoGoList(SearchPmPlanReq req) {
 		List<PmWorkshopNoGoListRes> pmWorkshopNoGoList = preventMistakeMapper.getPmWorkshopNoGoList(req);
     	return ResponseBeanBuilder.ok(pmWorkshopNoGoList, Function.identity());
@@ -709,6 +724,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @param req
 	 * @return 不放行任务对应的点检项目
 	 */
+	@Override
 	public ResponseBean<List<PmItemNoGoListRes>> getPmItemNoGoList(SearchWorkshopReq req) {
 		List<PmItemNoGoListRes> pmItemNoGoList = preventMistakeMapper.getPmItemNoGoList(req);
     	return ResponseBeanBuilder.ok(pmItemNoGoList, Function.identity());
@@ -721,9 +737,81 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	 * @return
 	 */
 	public ResponseBean editItemResult(EditItemResultListReq req) {
+//		/* 任务和巡检结果记录历史 */
+//		PmTaskRes pmTaskRes = new PmTaskRes();
+//		OnsiteTask onsiteTask = onsiteTaskService.getById(req.getOnsiteTaskId());
+//		pmTaskRes.setOnsiteTaskId(onsiteTask.getId());
+//		pmTaskRes.setOnsiteCalendarId(onsiteTask.getOnsiteCalendarId());
+//		pmTaskRes.setStatus(onsiteTask.getStatus());
+//		pmTaskRes.setTaskTime(onsiteTask.getTaskTime());
+//		pmTaskRes.setRemindTaskFlag(onsiteTask.getRemindTaskFlag());
+//		pmTaskRes.setRemindNoworkFalg(onsiteTask.getRemindNoworkFalg());
+//		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
+//                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
+//		pmTaskRes.setOnsiteItemResultList(onsiteItemResultList);
+//		
+//		try {
+//			OnsiteTaskHisBlob onsiteTaskHisBlob = OnsiteTaskHisBlob.builder()
+//					.onsiteTaskId(req.getOnsiteTaskId())
+//					.hisContent(this.objectToByteArray(pmTaskRes))
+//					.build();
+//			onsiteTaskHisBlobService.save(onsiteTaskHisBlob);
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+
+		/* 更新巡检项目检查结果 */
+		List<EditItemResultReq> editItemResultList = req.getEditItemResultList();
+    	for (EditItemResultReq editItemResult : editItemResultList) {
+    		onsiteItemResultService.remove(Wrappers.<OnsiteItemResult>lambdaQuery()
+                    .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId())
+                    .eq(OnsiteItemResult::getOnsiteItemId, editItemResult.getOnsiteItemId()));
+
+    		OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()
+    				.onsiteTaskId(req.getOnsiteTaskId())
+    				.onsiteItemId(editItemResult.getOnsiteItemId())
+    				.result(editItemResult.getResult())
+    				.build();
+    		onsiteItemResultService.save(onsiteItemResult);
+    	}
+
+		return ResponseBeanBuilder.ok();
+	}
+	
+	/**
+     * 修改防错计划
+     * @param req
+     * @return 
+     */
+	@Override
+	public void setOnsitePlanHis(Long bentelerPlanId) {
+
+		SearchPmPlanReq searchPmPlanReq = new SearchPmPlanReq();
+		searchPmPlanReq.setBentelerPlanId(bentelerPlanId);
+		PmPlanRes pmPlanRes = this.getPmPlan(searchPmPlanReq);
+		try {
+			OnsitePlanHisBlob onsitePlanHisBlob = OnsitePlanHisBlob.builder()
+					.bentelerPlanId(bentelerPlanId)
+					.hisContent(this.objectToByteArray(pmPlanRes))
+					.build();
+			onsitePlanHisBlobService.save(onsitePlanHisBlob);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 任务和巡检结果记录历史
+	 * 
+	 * @param onsiteTaskId
+	 * @return
+	 */
+	public void setOnsiteTaskHis(Long onsiteTaskId) {
 		/* 任务和巡检结果记录历史 */
 		PmTaskRes pmTaskRes = new PmTaskRes();
-		OnsiteTask onsiteTask = onsiteTaskService.getById(req.getOnsiteTaskId());
+		OnsiteTask onsiteTask = onsiteTaskService.getById(onsiteTaskId);
 		pmTaskRes.setOnsiteTaskId(onsiteTask.getId());
 		pmTaskRes.setOnsiteCalendarId(onsiteTask.getOnsiteCalendarId());
 		pmTaskRes.setStatus(onsiteTask.getStatus());
@@ -731,12 +819,12 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		pmTaskRes.setRemindTaskFlag(onsiteTask.getRemindTaskFlag());
 		pmTaskRes.setRemindNoworkFalg(onsiteTask.getRemindNoworkFalg());
 		List<OnsiteItemResult> onsiteItemResultList = onsiteItemResultService.list(Wrappers.<OnsiteItemResult>lambdaQuery()
-                .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId()));
+                .eq(OnsiteItemResult::getOnsiteTaskId, onsiteTaskId));
 		pmTaskRes.setOnsiteItemResultList(onsiteItemResultList);
 		
 		try {
 			OnsiteTaskHisBlob onsiteTaskHisBlob = OnsiteTaskHisBlob.builder()
-					.onsiteTaskId(req.getOnsiteTaskId())
+					.onsiteTaskId(onsiteTaskId)
 					.hisContent(this.objectToByteArray(pmTaskRes))
 					.build();
 			onsiteTaskHisBlobService.save(onsiteTaskHisBlob);
@@ -744,23 +832,6 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-
-		/* 更新巡检项目检查结果 */
-		List<EditItemResultReq> editItemResultList = req.getEditItemResultList();
-    	for (EditItemResultReq editItemResult : editItemResultList) {
-    		onsiteItemResultService.remove(Wrappers.<OnsiteItemResult>lambdaQuery()
-                    .eq(OnsiteItemResult::getOnsiteTaskId, req.getOnsiteTaskId())
-                    .eq(OnsiteItemResult::getOnsiteItemId, editItemResult.getOnsiteItemId()));
-
-    		OnsiteItemResult onsiteItemResult = OnsiteItemResult.builder()
-    				.onsiteTaskId(req.getOnsiteTaskId())
-    				.onsiteItemId(editItemResult.getOnsiteItemId())
-    				.result(editItemResult.getResult())
-    				.build();
-    		onsiteItemResultService.save(onsiteItemResult);
-    	}
-
-		return ResponseBeanBuilder.ok();
 	}
     
     

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

@@ -201,6 +201,14 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @return 审批人
 	 */
 	public ResponseBean<ApprovalUserRes> getApprovalUser(SearchApprovalUserReq req);
+	
+	/**
+     * 取得审批人
+     * @param approvalLevel 1是1级审批 2是2级审批
+     * @param type 1计划审批  2首件任务审批  3防错任务审批
+     * @return 审批人
+     */
+    public ApprovalUserRes getApprovalUserInfo(int approvalLevel, int type);
 
 	/**
 	 * 取得每频次点检信息
@@ -233,5 +241,20 @@ public interface PreventMistakeService extends IService<BentelerPlan> {
 	 * @return
 	 */
 	public ResponseBean editItemResult(EditItemResultListReq req);
+	
+	/**
+     * 修改防错计划
+     * @param bentelerPlanId
+     * @return 
+     */
+	public void setOnsitePlanHis(Long bentelerPlanId);
+	
+	/**
+	 * 任务和巡检结果记录历史
+	 * 
+	 * @param onsiteTaskId
+	 * @return
+	 */
+	public void setOnsiteTaskHis(Long onsiteTaskId);
 
 }

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

@@ -165,7 +165,8 @@
 		       ot.`status`,
 			   oc.benteler_plan_id,
 			   bp.`name` AS benteler_plan_name,
-			   oc.id AS onsite_calendar_id
+			   oc.id AS onsite_calendar_id,
+			   oc.type_flag
 		FROM   onsite_task ot,
 		       onsite_calendar oc,
 			   benteler_plan bp
@@ -181,10 +182,9 @@
 		<if test="req.type == 2"> <!-- 待重检（不放行） -->
 		AND    ot.`status` = 3
 		</if>
-		-- AND    ot.task_time = #{req.taskTime}
 		AND    TO_DAYS(ot.task_time) = TO_DAYS(NOW())
 		AND    oc.user_id = #{req.userId}
-        GROUP BY ot.id
+        -- GROUP BY ot.id
     </select>
     
     <!--取得审批人 -->