From ea12b685190254228d88a0de261b1e399fcbf15b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydwcs_cs20251105
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 881cf90..dc1c952 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -109,12 +109,19 @@
return R.error();
}
TaskWrkLog taskWrkLog1 = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).orderBy("MODI_TIME",false));
+ Date modiTime = taskWrkLog1.getModiTime();
if (taskWrkLog1 == null) {
return R.error();
}
taskWrkLog1.setStartPoint(taskWrkLog.getStartPoint());
taskWrkLog1.setTargetPoint(taskWrkLog.getTargetPoint());
- taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",taskWrkLog1.getModiTime()));
+ taskWrkLog1.setModiTime(taskWrkLog.getModiTime());//淇敼鏃堕棿
+// taskWrkLog1.setCancelTime(taskWrkLog.getCancelTime());//鍙栨秷鏃堕棿
+ taskWrkLog1.setAssignTime(taskWrkLog.getAssignTime());//娲惧彂鏃堕棿
+ taskWrkLog1.setCompleteTime(taskWrkLog.getCompleteTime());//瀹岀粨鏃堕棿
+ taskWrkLog1.setExecuteTime(taskWrkLog.getExecuteTime());//鎵ц鏃堕棿
+ taskWrkLog1.setCreateTime(taskWrkLog.getCreateTime());//鎵ц鏃堕棿
+ taskWrkLogService.update(taskWrkLog1,new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).eq("MODI_TIME",modiTime));
return R.ok();
}
--
Gitblit v1.9.1