From 365b409cdb629396cd2cbb2635ee10309cd3cd96 Mon Sep 17 00:00:00 2001
From: wj <2932352213@qq.com>
Date: 星期三, 06 五月 2026 13:35:37 +0800
Subject: [PATCH] feat:添加批量放置货架功能，添加导出弹窗，可导出筛选的数据
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
index 4ccf9a6..d8ebe5e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/CodeController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.QrCodeCodecSupport;
@@ -202,7 +203,52 @@
@PreAuthorize("hasAuthority('manager:code:list')")
@PostMapping("/code/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(codeService.list(), Code.class), response);
+ // 1. 鎻愬彇绛涢�夋潯浠讹紙鍏煎鍓嶇 { filter: {...} } 鏍煎紡锛�
+ Map<String, Object> filter = map;
+ if (map != null && map.containsKey("filter")) {
+ Object filterObj = map.get("filter");
+ if (filterObj instanceof Map) {
+ filter = (Map<String, Object>) filterObj;
+ }
+ }
+
+ // 2. 鏋勫缓鏌ヨ鏉′欢锛圡yBatis-Plus锛�
+ QueryWrapper<Code> wrapper = new QueryWrapper<>();
+ if (filter != null && !filter.isEmpty()) {
+ // 鏍规嵁鍓嶇鍙兘浼犻�掔殑瀛楁娣诲姞鏉′欢锛堝瓧娈靛悕闇�涓庢暟鎹簱鍒楁垨瀹炰綋灞炴�у搴旓級
+ if (filter.containsKey("corner")) {
+ wrapper.eq("corner", filter.get("corner"));
+ }
+ if (filter.containsKey("condition")) {
+ String condition = (String) filter.get("condition");
+ wrapper.and(w -> w.like("data", condition).or().like("uuid", condition));
+ }
+ if (filter.containsKey("timeStart")) {
+ wrapper.ge("create_time", filter.get("timeStart"));
+ }
+ if (filter.containsKey("timeEnd")) {
+ wrapper.le("create_time", filter.get("timeEnd"));
+ }
+ if (filter.containsKey("x")) {
+ wrapper.eq("x", filter.get("x"));
+ }
+ if (filter.containsKey("y")) {
+ wrapper.eq("y", filter.get("y"));
+ }
+ if (filter.containsKey("memo")) {
+ wrapper.like("memo", filter.get("memo"));
+ }
+ if (filter.containsKey("status")) {
+ wrapper.eq("status", filter.get("status"));
+ }
+ // 杩樺彲浠ユ坊鍔犲叾浠栧瓧娈靛 data, uuid 绛�
+ }
+
+ // 3. 鏌ヨ绗﹀悎鏉′欢鐨勬暟鎹�
+ List<Code> list = codeService.list(wrapper);
+
+ // 4. 瀵煎嚭 Excel
+ ExcelUtil.build(ExcelUtil.create(list, Code.class), response);
}
@PreAuthorize("hasAuthority('manager:code:save')")
--
Gitblit v1.9.1