审核计划问题

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

@@ -272,9 +272,9 @@ public class PlanApprovalServiceImpl implements PlanApprovalService {
                 	if(!LocalDate.now().isBefore(plan.getEffectiveDate())) {//有效期已经过了当前日期了,那么立刻生效
                 		if(plan.getPrevId()!=null) {
                 			planService.lambdaUpdate().eq(BentelerPlan::getOriginalId,plan.getOriginalId())
-            				.in(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL,PlanStatus.APPROVAL_PASS)
+            				.in(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL.value,PlanStatus.APPROVAL_PASS.value)
             				.lt(BentelerPlan::getId,plan.getId())
-            				.set(BentelerPlan::getStatus, PlanStatus.HISTORY).update();
+            				.set(BentelerPlan::getStatus, PlanStatus.HISTORY.value).update();
                 		}
                 		planUpdate.setStatus(PlanStatus.APPROVAL_FORMAL.value);
                 	}

application-task/src/main/java/com/factory/service/impl/PlanServiceImpl.java

@@ -33,7 +33,7 @@ public class PlanServiceImpl extends ServiceImpl<BentelerPlanMapper, BentelerPla
 	@Override
 	public void effectPlan(LocalDate now) {
 		List<BentelerPlan> list = this.lambdaQuery()
-				.eq(BentelerPlan::getStatus, PlanStatus.APPROVAL_PASS)
+				.eq(BentelerPlan::getStatus, PlanStatus.APPROVAL_PASS.value)
 				.le(BentelerPlan::getEffectiveDate, now)
 				.orderByDesc(BentelerPlan::getId)
 				.list();
@@ -46,11 +46,11 @@ public class PlanServiceImpl extends ServiceImpl<BentelerPlanMapper, BentelerPla
 				cacheMap.put(plan.getOriginalId(), plan);
 				//旧计划都更新已过期
 				this.lambdaUpdate().eq(BentelerPlan::getOriginalId,plan.getOriginalId())
-				.in(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL,PlanStatus.APPROVAL_PASS)
+				.in(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL.value,PlanStatus.APPROVAL_PASS.value)
 				.lt(BentelerPlan::getId,plan.getId())
-				.set(BentelerPlan::getStatus, PlanStatus.HISTORY).update();
+				.set(BentelerPlan::getStatus, PlanStatus.HISTORY.value).update();
 				//当前计划更新生效
-				this.lambdaUpdate().eq(BentelerPlan::getId,plan.getId()).set(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL).update();
+				this.lambdaUpdate().eq(BentelerPlan::getId,plan.getId()).set(BentelerPlan::getStatus, PlanStatus.APPROVAL_FORMAL.value).update();
 				listMake.add(plan);
 			}else {
 				//用直接生效的抛弃