巡检撤销按钮

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

@@ -7,7 +7,6 @@ import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
-import com.hnac.hzinfo.inspect.plan.PlanContants;
 import com.hnac.hzinfo.inspect.plan.entity.PlanEntity;
 import com.hnac.hzinfo.inspect.plan.service.IPlanObjectTemplateService;
 import com.hnac.hzinfo.inspect.plan.service.IPlanService;
@@ -74,9 +73,9 @@ public class PlanController extends BladeController {
 		if(plan.getEndTime()!=null){
 			queryWrapper.le(PlanEntity::getEndTime,plan.getEndTime());
 		}
-		if(plan.getStatus()==null){
+//		if(plan.getStatus()==null){
-			queryWrapper.ne(PlanEntity::getStatus, PlanContants.PlanStatusEnum.PLAN_AUTH.getStatus());
+//			queryWrapper.ne(PlanEntity::getStatus, PlanContants.PlanStatusEnum.PLAN_AUTH.getStatus());
-		}
+//		}
 		if(plan.getCreateDept()!=null){
 			queryWrapper.eq(PlanEntity::getCreateDept,plan.getCreateDept());
 		}
@@ -107,10 +106,10 @@ public class PlanController extends BladeController {
 	/**
 	 * 撤销
 	 */
-	@PostMapping("/revoke")
+	@GetMapping("/revoke")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "撤销", notes = "传入plan")
-	public  R<Boolean> revoke(@Valid @RequestBody Long planId) {
+	public  R<Boolean> revoke(@RequestParam Long planId) {
 		return R.data(planService.revoke(planId));
 	}
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/service/impl/PlanServiceImpl.java

@@ -117,7 +117,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 	public Boolean revoke(Long planId) {
 		boolean re;
 		LambdaUpdateWrapper<PlanEntity> uw = new UpdateWrapper<PlanEntity>().lambda();
-		uw.set(PlanEntity::getStatus, PlanContants.PlanStatusEnum.PLAN_SUBMIT);
+		uw.set(PlanEntity::getStatus, PlanContants.PlanStatusEnum.PLAN_SUBMIT.getStatus());
 		uw.eq(PlanEntity::getId, planId);
 		re = update(uw);
 		return re;