From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java
index c808cd7..4c850d6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/JamController.java
@@ -31,7 +31,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Jam, BaseParam> pageParam = new PageParam<>(baseParam, Jam.class);
- return R.ok().add(jamService.page(pageParam, pageParam.buildWrapper(true, "start_time")));
+ return R.ok().add(jamService.page(pageParam, pageParam.buildWrapper(false, "start_time")));
}
@PreAuthorize("hasAuthority('manager:jam:list')")
@@ -108,4 +108,11 @@
ExcelUtil.build(ExcelUtil.create(jamService.list(), Jam.class), response);
}
+ @PreAuthorize("hasAuthority('manager:jam:update')")
+ @OperationLog("Deprecate Task")
+ @GetMapping("/jam/deprecate/{id}")
+ public R deprecate(@PathVariable Long id) {
+ return jamService.deprecate(id, getLoginUserId()) ? R.ok("Deprecate Success") : R.error("Deprecate Fail");
+ }
+
}
--
Gitblit v1.9.1