From 9d603e7d97d2a94840eb5f1fc94a7222b730d71d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 08 一月 2026 15:57:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasArmMastController.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasArmMastController.java b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
index 9124c64..ac73fc1 100644
--- a/src/main/java/com/zy/asrs/controller/BasArmMastController.java
+++ b/src/main/java/com/zy/asrs/controller/BasArmMastController.java
@@ -43,8 +43,33 @@
convert(param, wrapper);
allLike(BasArmMast.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("create_time",false);
return R.ok(basArmMastService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/basArmMast/listArm/auth")
+ @ManagerAuth
+ public R listArm(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<BasArmMast> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasArmMast.class, param.keySet(), wrapper, condition);
+
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("create_time", false);
+
+ // 濡傛灉涓嶉渶瑕佸垎椤碉紝浣跨敤 selectList() 鑾峰彇鎵�鏈夋暟鎹�
+ List<BasArmMast> allData = basArmMastService.selectList(wrapper);
+
+ return R.ok(allData); // 鐩存帴杩斿洖鎵�鏈夋暟鎹�
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -53,6 +78,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("binding_tags")){
+ long aLong = Long.parseLong(val);
+ wrapper.ge(entry.getKey(), aLong);
} else {
wrapper.like(entry.getKey(), val);
}
--
Gitblit v1.9.1