From 80e73d98a876af4b6c9efff7c74e908b056d8f4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 11:28:39 +0800
Subject: [PATCH] 添加生产报表默认查询时间相关配置部分代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
index 13fd43f..116db21 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java
@@ -33,7 +33,7 @@
result = orderDetails.stream()
.collect(Collectors.collectingAndThen(
Collectors.toMap(
- map -> map.get("order_id") + "_" + map.get("order_number"),
+ map -> map.get("order_id"),
map -> map,
(existing, replacement) -> existing // 淇濈暀绗竴涓嚭鐜扮殑
),
@@ -42,13 +42,12 @@
//寰幆鑾峰彇鍥剧墖
List<OrderFile> orderFiles = new ArrayList<>();
for (Map<String,Object> obj : result) {
- OrderFile orderFile = orderFileMapper.selectOne(new QueryWrapper<OrderFile>()
+ List<OrderFile> orderFile = orderFileMapper.selectList(new QueryWrapper<OrderFile>()
.select("order_id, order_number, image_base64")
.eq("order_id", obj.get("order_id"))
- .eq("order_number", obj.get("order_number"))
);
if (orderFile != null){
- orderFiles.add(orderFile);
+ orderFiles.addAll(orderFile);
}
}
return orderFiles;
@@ -68,7 +67,7 @@
// 璁剧疆瀹藉害
rasterizationOptions.setPageWidth(1000);
// 璁剧疆楂樺害
- rasterizationOptions.setPageHeight(1000);
+ rasterizationOptions.setPageHeight(700);
// 璋冪敤杩欎釜setEmbedBackground鏂规硶鏉ヨ缃儗鏅壊鏄惁涓嶇瓑浜庤緭鍑烘牸寮忕殑榛樿鑳屾櫙鑹�
//rasterizationOptions.setEmbedBackground(true);
// 涓虹敓鎴愮殑鍥惧儚鍒涘缓涓�涓狿ngOptions鐨勫疄渚嬶紝骞跺皢鍏跺垎閰嶇粰ImageOptionsBase绫荤殑瀹炰緥銆�
@@ -103,10 +102,24 @@
}
- return base64;
+ return orderFile;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
+
+ public Object getOrderNumberFile(String orderId, String orderNumber) {
+ return orderFileMapper.selectOne(new QueryWrapper<OrderFile>()
+ .eq("order_id", orderId)
+ .eq("order_number", orderNumber)
+ );
+ }
+
+ public Boolean deleteOrderNumberFile(String orderId, String orderNumber) {
+ return orderFileMapper.delete(new QueryWrapper<OrderFile>()
+ .eq("order_id", orderId)
+ .eq("order_number", orderNumber)
+ ) > 0;
+ }
}
--
Gitblit v1.8.0