From a6ae7c44fccca62e535c763aae0e599d2f3f73b0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 29 五月 2024 14:27:53 +0800
Subject: [PATCH] 增加通过多个base64PDF合并为一个
---
ltkj-admin/src/main/java/com/ltkj/web/jmreport/ReportDataController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/ReportDataController.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/ReportDataController.java
index a77f2df..8dfc2cd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/ReportDataController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/ReportDataController.java
@@ -402,9 +402,16 @@
*/
@GetMapping("/jiwangbingshi")
@ApiOperation(value = "鑱屼笟鍋ュ悍鎶ュ憡鏌ヨ鏃㈠線鐥呭彶")
- public String jiwangbingshi(@RequestParam("tjNumber") String tjNumber) {
- final String jiwangbingshi = tjAskHistorysMapper.jiwangbingshi(tjNumber);
- return jiwangbingshi;
+ public Map<String,List<Map<String,String>>> jiwangbingshi(@RequestParam("tjNumber") String tjNumber) {
+ final Map<String,String> jiwangbingshi = tjAskHistorysMapper.jiwangbingshi(tjNumber);
+ Map<String,List<Map<String,String>>> aa=new HashMap<>();
+ Map<String,String> bb=new HashMap<>();
+ List<Map<String,String>> cc=new ArrayList<>();
+ cc.add(bb);
+ bb.put("jiwangbingshi",jiwangbingshi.get("鏃㈠線鐥呭彶"));
+ bb.put("qita",jiwangbingshi.get("鍏朵粬"));
+ aa.put("data",cc);
+ return aa;
}
--
Gitblit v1.8.0