From 9d7bfe8cf15f1b34a87351560f39662d9e141cce Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 20 一月 2026 11:09:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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..9a0ff71 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -40,6 +40,10 @@
Integer wrkNo = null;
String taskNo = null;
Integer status = null;
+ String barcode = null;
+ String startPoint = null;
+ String targetPoint = null;
+ String allField = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -56,15 +60,23 @@
taskNo = val;
} else if (entry.getKey().equals("status")) {
status = Integer.parseInt(val);
+ } else if (entry.getKey().equals("barcode")) {
+ barcode = val;
+ } else if (entry.getKey().equals("startPoint")) {
+ startPoint = val;
+ } else if (entry.getKey().equals("targetPoint")) {
+ targetPoint = val;
+ } else if (entry.getKey().equals("allField")) {
+ allField = val;
}
}
- List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
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);
+ taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, 1, limit);
page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
}
- page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
return R.ok(page);
} catch (Exception e) {
@@ -109,12 +121,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