From 5dca49269399c21333b16d62945c7f74570f9ad5 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 24 十二月 2025 20:33:59 +0800
Subject: [PATCH] 字段调整

---
 src/main/java/com/zy/asrs/controller/OrderDetlPakinLogController.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinLogController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinLogController.java
new file mode 100644
index 0000000..0af1cb1
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinLogController.java
@@ -0,0 +1,64 @@
+package com.zy.asrs.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.OrderDetlPakinLog;
+import com.zy.asrs.service.OrderDetlPakinLogService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("order/pakinLog")
+public class OrderDetlPakinLogController extends BaseController {
+
+    @Autowired
+    private OrderDetlPakinLogService orderDetlService;
+
+    @RequestMapping(value = "/orderDetl/list/auth")
+    @ManagerAuth
+    public R list(@RequestParam(defaultValue = "1") Integer curr,
+                  @RequestParam(defaultValue = "10") Integer limit,
+                  @RequestParam(required = false) String orderByField,
+                  @RequestParam(required = false) String orderByType,
+                  @RequestParam Map<String, Object> param) {
+        EntityWrapper<OrderDetlPakinLog> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        } else {
+            wrapper.orderBy("create_time", false);
+        }
+        Page<OrderDetlPakinLog> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+        return R.ok(orderDetlPage);
+    }
+
+    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            String key = entry.getKey();
+            String val = String.valueOf(entry.getValue());
+            if (Cools.isEmpty(val) || "null".equals(val)) {
+                continue;
+            }
+            if (val.contains(RANGE_TIME_LINK)) {
+                String[] dates = val.split(RANGE_TIME_LINK);
+                wrapper.ge(key, DateUtils.convert(dates[0]));
+                wrapper.le(key, DateUtils.convert(dates[1]));
+            } else if ("order_id".equals(key) || "orderId".equals(key)) {
+                // order_id浣跨敤绮剧‘鍖归厤
+                wrapper.eq(key, val);
+            } else {
+                wrapper.like(key, val);
+            }
+        }
+    }
+
+}
+

--
Gitblit v1.9.1