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/TaskWrkController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 1216a4a..833b07b 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -70,6 +70,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());
@@ -86,6 +90,14 @@
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;
}
}
//
@@ -94,9 +106,9 @@
// convert(param, wrapper);
// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
+ List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
- page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+ page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
return R.ok(page);
// return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));
--
Gitblit v1.9.1