From 56b2eb4d4f458ecf0586551df044f3caede0db97 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 15:55:12 +0800
Subject: [PATCH] #指令更新
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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..f82660e 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")
@@ -67,10 +67,28 @@
@RequestMapping(value = "/taskWrk/update/auth")
@ManagerAuth
public R update(TaskWrk taskWrk){
- if (Cools.isEmpty(taskWrk) || null==taskWrk.getTaskNo()){
+ if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrk/updatePoint/auth")
+ @ManagerAuth
+ public R updatePoint(TaskWrk taskWrk){
+ if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
+ return R.error();
+ }
+ TaskWrk taskWrk1 = taskWrkService.selectByTaskNo(taskWrk.getTaskNo());
+ if (taskWrk1 == null) {
+ return R.error();
+ }
+ taskWrk1.setStartPoint(taskWrk.getStartPoint());
+ taskWrk1.setTargetPoint(taskWrk.getTargetPoint());
+ taskWrk1.setModiTime(new Date());
+ taskWrk1.setModiUser(getUserId());
+ taskWrkService.updateById(taskWrk1);
return R.ok();
}
@@ -134,13 +152,17 @@
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();
taskWrk.setStatus(TaskStatusType.COMPLETE.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ try{
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ }catch (Exception e){
+ taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
@@ -153,16 +175,35 @@
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();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ try{
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ }catch (Exception e){
+ taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
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