From 653971c80651e1e137daa50eda390fd64e4621ef Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Thu, 11 Jul 2024 17:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E6=95=88=E5=A4=84=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/controller/InspectionRouteController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java index e308fa4..63889f4 100644 --- a/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java +++ b/src/main/java/org/energy/modules/inspection/controller/InspectionRouteController.java @@ -180,7 +180,7 @@ public class InspectionRouteController extends DafController { @ApiOperationSupport(order = 8) @ApiOperation(value = "生效", notes = "传入ids") public R takeEffect(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.updateInspectionRoute(1,ids); + return this.updateInspectionRoute(1, "", ids); } /** @@ -189,18 +189,19 @@ public class InspectionRouteController extends DafController { @PostMapping("/lapse") @ApiOperationSupport(order = 9) @ApiOperation(value = "失效", notes = "传入ids") - public R lapse(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return this.updateInspectionRoute(0,ids); + public R lapse(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "取消原因", required = true) @RequestParam String reason) { + return this.updateInspectionRoute(0, reason, ids); } /** * 生效OR失效 */ - public R updateInspectionRoute(Integer status, String ids) { + public R updateInspectionRoute(Integer status, String reason, String ids) { List list = new ArrayList<>(); for (String id : ids.split(",")) { InspectionRoute inspectionRoute = new InspectionRoute(); inspectionRoute.setId(Long.parseLong(id)); + inspectionRoute.setCancelReason(reason); inspectionRoute.setIstatus(status); list.add(inspectionRoute); }