From 3c714a53d5cc4c61815870bef0385b7108181773 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 14 一月 2026 13:31:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasArmMastSignController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
index 5587145..2a7d114 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastSignController.java
@@ -39,11 +39,60 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasArmMastSign> wrapper = new EntityWrapper<>();
+
+ // ===================== 1. 鎵嬪姩澶勭悊 binding_tags 鐨勭簿纭尮閰嶏紙瀛楃涓插舰寮忥級 =====================
+ if (param.containsKey("create_time")) {
+ String tag = String.valueOf(param.get("create_time")).trim();
+ if (!tag.isEmpty()) {
+ wrapper.eq("create_time", tag);
+ System.out.println("鎵嬪姩娣诲姞绮剧‘鏉′欢: create_time = " + tag);
+ }
+ // 鍙�夛細绉婚櫎鍘� param锛岄槻姝� allLike 鍐嶆骞叉壈锛堝鏋� allLike 浼氶噸澶嶅姞鏉′欢锛�
+ // param.remove("binding_tags");
+ }
+
+ // ===================== 2. 鍏朵粬鍘熸湁澶勭悊閫昏緫锛堟ā绯婃悳绱㈢瓑锛� =====================
excludeTrash(param);
convert(param, wrapper);
allLike(BasArmMastSign.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(basArmMastSignService.selectPage(new Page<>(curr, limit), wrapper));
+
+ // 鎺掑簭
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 鍒嗛〉鏌ヨ
+ Page<BasArmMastSign> page = new Page<>(curr, limit);
+ Page<BasArmMastSign> resultPage = basArmMastSignService.selectPage(page, wrapper);
+
+ // ===================== 3. 杩斿洖鏁版嵁澶勭悊锛堣浆瀛楃涓诧紝闃叉鍓嶇绮惧害涓㈠け锛� =====================
+ List<Map<String, Object>> newRecords = new ArrayList<>();
+ for (BasArmMastSign item : resultPage.getRecords()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", item.getId() != null ? item.getId().toString() : null); // 寤鸿杞瓧绗︿覆
+ map.put("status", item.getStatus());
+ map.put("matnr", item.getMatnr());
+ map.put("sku", item.getSku());
+ map.put("po", item.getPo());
+ map.put("upc", item.getUpc());
+ map.put("supplier", item.getSupplier());
+ map.put("orderNo", item.getOrderNo());
+ map.put("createTime", item.getCreateTime() != null ? item.getCreateTime().toString() : null);
+ map.put("status$", item.getStatus$());
+
+ newRecords.add(map);
+ }
+
+ // 鏋勯�犺繑鍥炵粨鏋�
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("total", resultPage.getTotal());
+ resultMap.put("size", resultPage.getSize());
+ resultMap.put("current", resultPage.getCurrent());
+ resultMap.put("pages", resultPage.getPages());
+ resultMap.put("records", newRecords);
+
+ return R.ok(resultMap);
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -53,6 +102,9 @@
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else if (entry.getKey().equals("create_time")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
--
Gitblit v1.9.1