From 1e18d2f1734062a38176e22113f2b65ad8aa2024 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 19 十月 2023 10:11:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index c9c8b73..080f9f4 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -24,10 +24,10 @@
@Autowired
private TaskWrkService taskWrkService;
- @RequestMapping(value = "/taskWrk/{id}/auth")
+ @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(taskWrkService.selectById(String.valueOf(id)));
+ public R get(@PathVariable("wrkNo") Integer wrkNo) {
+ return R.ok(taskWrkService.selectByWrkNo(wrkNo));
}
@RequestMapping(value = "/taskWrk/list/auth")
@@ -134,7 +134,7 @@
if (taskWrk == null) {
return R.error();
}
- if (taskWrk.getStatus() == TaskStatusType.COMPLETE.id) {
+ if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
return R.error(taskWrk.getTaskNo() + "宸插畬缁�");
}
Date now = new Date();
@@ -153,7 +153,7 @@
if (taskWrk == null) {
return R.error();
}
- if (taskWrk.getStatus() == TaskStatusType.CANCEL.id) {
+ if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
}
Date now = new Date();
@@ -165,4 +165,19 @@
return R.ok();
}
+ @PostMapping(value = "/taskWrk/updateCommandStep")
+ @ManagerAuth(memo = "鏇存柊姝ュ簭")
+ public R updateCommandStep(@RequestParam Integer wrkNo, @RequestParam Integer commandStep) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(wrkNo);
+ if (taskWrk == null) {
+ return R.error();
+ }
+ Date now = new Date();
+ taskWrk.setCommandStep(commandStep);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1