From 731ab1ab578873d0374823fe0ca6f6928b50bd32 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 15 七月 2024 13:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 18d398f..5bc3124 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -218,9 +218,18 @@
return map;
}
- public Object selectPrintSv(String orderId, FlowCard flowCard) {
+ public Object selectPrintSv(Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("detail", flowCardMapper.selectPrintMp(flowCard.getOrderId()));
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
map.put("type", flowCardMapper.selectType());
return map;
}
--
Gitblit v1.8.0