From 3b5b98a9911e3231cefe5ab4f47a4c9d94e5a2f7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 16:15:01 +0800
Subject: [PATCH] #将错误码存入备注字段进行展示
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 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 0ca6cee..f82660e 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -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,13 +175,17 @@
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();
--
Gitblit v1.9.1