更新防错点检内容不生成任务

application-facade/src/main/java/com/factory/web/entity/fa/req/SearchFaTaskInfoReq.java

@@ -33,5 +33,7 @@ public class SearchFaTaskInfoReq {
 
     @ApiModelProperty(value = "0初始化 1待审核状态 2放行 3不通过 4通过")
     private Integer status;
+    @ApiModelProperty(value = "中断任务ID可为空,为空获取最新未完成或新建一个",hidden=true)
+    private Long taskId;
 
 }

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

@@ -60,5 +60,8 @@ public class OnsiteCalendar implements Serializable {
 
     @ApiModelProperty(value = "班次")
     private String shift;
+    
+    @ApiModelProperty(value = "是否有效:有对应检查项：1无0")
+    private Boolean effectFlag;
 
 }

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

@@ -604,6 +604,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         SearchFaTaskInfoReq searchFaTaskInfoReq = new SearchFaTaskInfoReq();
         searchFaTaskInfoReq.setBentelerPlanId(req.getBentelerPlanId());
         searchFaTaskInfoReq.setTypeFlag(req.getTypeFlag());
+        searchFaTaskInfoReq.setTaskId(req.getTaskId());
         //获取对应task信息
         FirstArticleTask faTaskInfo = null;
         if (req.getTypeFlag() == 0 || req.getTypeFlag() == 1) { // 0表示首件 1表示200件
@@ -1104,6 +1105,9 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
         			.remindTaskFlag(0)
         			.build();
         	
+        	firstArticleTaskService.save(firstArticleTask);
+        }else {
+        	firstArticleTask = firstArticleTaskService.getById(firstArticleTask.getId());
         }
         return firstArticleTask;
     }

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

@@ -5,7 +5,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -211,6 +214,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 					.userId(onsiteCalendarReq.getUserId())
 					.typeFlag(onsiteCalendarReq.getTypeFlag())
 					.shift(onsiteCalendarReq.getShift())
+					.effectFlag(false)
 					.build();
 			onsiteCalendarService.save(onsiteCalendar);
 		}
@@ -225,7 +229,8 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-
+		Set<Integer> typeSet = new HashSet<>(4);
+		
 		/* 添加工作站信息 */
 		List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 		for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
@@ -248,9 +253,11 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 						.typeFlag(onsiteItemReq.getTypeFlag())
 						.inspectionFlag(onsiteItemReq.getInspectionFlag())
 						.build();
+				typeSet.add(onsiteItemReq.getTypeFlag());
 				onsiteItemService.save(onsiteItem);
 			}
 		}
+		this.checkCalendarEffect(plan.getId(),typeSet);
 		planService.updateById(BentelerPlan.builder()
 				.id(plan.getId())
 				.originalId(plan.getId())
@@ -467,6 +474,9 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			}
 		}
 		boolean clearApproval = false;
+		
+		Set<Integer> typeSet = new HashSet<>(4);
+		
 		if(oldPlan.getStatus()>=PlanStatus.APPROVAL_PASS.value) { // 审批通过
 			/* 添加防错计划 */
 			plan = BentelerPlan.builder()
@@ -495,6 +505,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 						.userId(onsiteCalendarReq.getUserId())
 						.typeFlag(onsiteCalendarReq.getTypeFlag())
 						.shift(onsiteCalendarReq.getShift())
+						.effectFlag(false)
 						.build();
 				onsiteCalendarService.save(onsiteCalendar);
 			}
@@ -509,7 +520,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-
+			
 			/* 添加工作站信息 */
 			List<OnsiteWorkshopReq> onsiteWorkshopList = req.getOnsiteWorkshopList();
 			for (OnsiteWorkshopReq onsiteWorkshopReq : onsiteWorkshopList) {
@@ -533,34 +544,12 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 							.typeFlag(onsiteItemReq.getTypeFlag())
 							.inspectionFlag(onsiteItemReq.getInspectionFlag())
 							.build();
+					typeSet.add(onsiteItemReq.getTypeFlag());
 					onsiteItemService.save(onsiteItem);
 				}
 			}
-	
-		
 		} else { // 没审批通过
 			
-//			/* 将之前的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();
-//				}
-//			}
-
 			/* 修改防错计划 */
 			plan = BentelerPlan.builder()
 					.id(oldPlan.getId())
@@ -588,6 +577,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 						.month(onsiteCalendarReq.getMonth())
 						.userId(onsiteCalendarReq.getUserId())
 						.typeFlag(onsiteCalendarReq.getTypeFlag())
+						.effectFlag(false)
 						.shift(onsiteCalendarReq.getShift())
 						.build();
 				onsiteCalendarService.save(onsiteCalendar);
@@ -641,15 +631,33 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 							.typeFlag(onsiteItemReq.getTypeFlag())
 							.inspectionFlag(onsiteItemReq.getInspectionFlag())
 							.build();
+					typeSet.add(onsiteItemReq.getTypeFlag());
 					onsiteItemService.save(onsiteItem);
 				}
 			}
 			clearApproval = true;
 		}
+		this.checkCalendarEffect(plan.getId(),typeSet);
+		
 		onsiteApprovalPlanService.setApprovalFirst(plan.getId(),clearApproval);
-
+		
 		return ResponseBeanBuilder.ok();
 	}
+	/**
+	 * 设置有效性
+	 * @param planId
+	 * @param typeSet
+	 */
+	private void checkCalendarEffect(Long planId,Set<Integer> typeSet) {
+		for(Integer type:typeSet) {
+			OnsiteCalendar onsiteCalendar = OnsiteCalendar.builder()
+					.bentelerPlanId(planId)
+					.typeFlag(type)
+					.effectFlag(true)
+					.build();
+			onsiteCalendarService.update(new UpdateWrapper<OnsiteCalendar>(onsiteCalendar));
+		}
+	}
 
 
     /**

application-task/src/main/java/com/factory/init/OnsiteRemindJob.java

@@ -256,4 +256,8 @@ public class OnsiteRemindJob implements Job {
         }
     }
 
+    public static void main(String[] args) {
+    	 LocalDateTime now = LocalDateTime.now();
+    	 System.out.println(now.getDayOfWeek().getValue());
+    }
 }

application-task/src/main/resources/mappers/OnsiteTaskMapper.xml

@@ -98,7 +98,7 @@
         FROM 
         benteler_plan bp
 		join onsite_approval_plan oap on oap.benteler_plan_id = bp.id and oap.approval_level = 2 and oap.`status` = 1
-		join onsite_calendar oc on  oc.benteler_plan_id = bp.id and oc.type_flag=#{type_flag} 
+		join onsite_calendar oc on  oc.benteler_plan_id = bp.id and oc.type_flag=#{type_flag} and oc.effect_type=1
 		left join onsite_task ot on ot.onsite_calendar_id = oc.id
         <choose>
         	<when test="type_flag==2">
@@ -192,6 +192,7 @@
         		and a.remind_nowork_flag = 0<!--  and a.remind_task_flag=1  -->
         	</otherwise>
         </choose>
+        and TO_DAYS(a.task_time) &gt;= TO_DAYS(now());
     </select>
 
     <update id="updateOnsiteRemindFlag">