From 24fc54262b62a4f6835be68cd318c14e4d7327ef Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期六, 13 十二月 2025 17:39:31 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index b705e4e..54eb1e6 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -38,7 +38,7 @@
@RequestParam Map<String, Object> param){
try{
Integer wrkNo = null;
- Integer taskNo = null;
+ String taskNo = null;
Integer status = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -53,15 +53,19 @@
} else if (entry.getKey().equals("wrk_no")) {
wrkNo = Integer.parseInt(val);
} else if (entry.getKey().equals("task_no")) {
- taskNo = Integer.parseInt(val);
+ taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
}
}
List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
- Page<TaskWrkLog> page1 = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
- page1.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
- return R.ok(page1);
+ Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
+ if (page.getRecords().size()==0){
+ taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit);
+ page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
+ }
+ page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ return R.ok(page);
} catch (Exception e) {
return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());
@@ -98,6 +102,28 @@
return R.ok();
}
+ @RequestMapping(value = "/taskWrkLog/updatePoint/auth")
+ @ManagerAuth
+ public R updatePoint(TaskWrkLog taskWrkLog){
+ if (Cools.isEmpty(taskWrkLog) || null == taskWrkLog.getTaskNo()) {
+ return R.error();
+ }
+ TaskWrkLog taskWrkLog1 = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("TASK_NO", taskWrkLog.getTaskNo()).eq("WRK_NO", taskWrkLog.getWrkNo()).orderBy("MODI_TIME",false));
+ if (taskWrkLog1 == null) {
+ return R.error();
+ }
+ taskWrkLog1.setStartPoint(taskWrkLog.getStartPoint());
+ taskWrkLog1.setTargetPoint(taskWrkLog.getTargetPoint());
+ 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",taskWrkLog1.getModiTime()));
+ return R.ok();
+ }
+
@RequestMapping(value = "/taskWrkLog/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
--
Gitblit v1.9.1