From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index b2df62c..1106f24 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -16,7 +16,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class WrkDetlLogController extends BaseController {
@@ -77,28 +80,16 @@
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
try {
- Integer wrkNo = null;
- String orderNo = null;
- Date modiTimeStart = null, modiTimeEnd = null;
- for (Map.Entry<String, Object> entry : param.entrySet()) {
- String val = String.valueOf(entry.getValue());
- if (Cools.isEmpty(val)) {
- continue;
- }
- if (val.contains(RANGE_TIME_LINK)) {
- String[] dates = val.split(RANGE_TIME_LINK);
- modiTimeStart = DateUtils.convert(dates[0]);
- modiTimeEnd = DateUtils.convert(dates[1]);
- } else if (entry.getKey().equals("wrk_no")) {
- wrkNo = Integer.parseInt(val);
- } else if (entry.getKey().equals("order_no")) {
- orderNo = val;
- }
+ excludeTrash(param);
+ EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(WrkDetlLog.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
- Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd));
- return R.ok(page1);
+ return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
} catch (Exception e) {
return R.error("寮傚父" + e);
}
--
Gitblit v1.9.1