From aa78a9846516e2216c1f2cd494a43df00a188871 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 四月 2025 17:18:58 +0800
Subject: [PATCH] 修改 # 收货单据模板修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
index e8b7059..b221e6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
@@ -1,6 +1,8 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -133,14 +135,18 @@
@PostMapping("/asnOrderItem/export")
@ApiOperation("瀵煎嚭鏀惰揣閫氱煡鍗曟槑缁�")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-// AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
-// List<AsnOrderTemplate> list = new ArrayList<>();
-// list.add(template);
List<AsnOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(map.get("ids"))) {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getId, map.get("ids")).eq(AsnOrderItem::getStatus, 1));
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getId, ids)
+ .eq(AsnOrderItem::getStatus, 1));
+ } else {
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
+ }
} else {
- orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>());
+ orderItems = asnOrderItemService.list(new LambdaQueryWrapper<>());
}
ExcelUtil.build(ExcelUtil.create(orderItems, AsnOrderItem.class, true), response);
--
Gitblit v1.9.1