From c8f873c85f86c50c479900abea194dc6bb46a2e4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 27 九月 2024 18:10:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
index e00dd3b..bf51a1c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsQueryTemplateController.java
@@ -4,7 +4,6 @@
import com.vci.corba.common.PLException;
import com.vci.corba.omd.qtm.QTD;
import com.vci.dto.QTInfoDTO;
-import com.vci.pagemodel.QtQueryVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.ControllerUtil;
@@ -23,7 +22,10 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 鏌ヨ妯℃澘鐨勬帶鍒跺櫒
@@ -269,8 +271,8 @@
* @return
*/
@PostMapping("/expLinkTemplate")
- public void expLinkTemplate(@RequestBody List<String> names,HttpServletResponse response) throws PLException, IOException {
- quereyTemplateServiceI.expLinkTemplate(names, response);
+ public void expLinkTemplate(@RequestBody Map qtNames, HttpServletResponse response) throws PLException, IOException {
+ quereyTemplateServiceI.expLinkTemplate(String.valueOf(qtNames.get("qtNames")), response);
}
/**
@@ -359,10 +361,9 @@
* @return
*/
@PostMapping("/expBtmQTTemplate")
- public void expBtmQTTemplate(Map qtQueryMap, HttpServletResponse response) throws PLException, IOException {
+ public void expBtmQTTemplate(@RequestBody Map qtNames, HttpServletResponse response) throws PLException, IOException {
try {
- String qtNames = (String)qtQueryMap.get("qtNames");
- String excelPath = quereyTemplateServiceI.expBtmQTTemplate(Arrays.asList(qtNames.split(",")));
+ String excelPath = quereyTemplateServiceI.expBtmQTTemplate(String.valueOf(qtNames.get("qtNames")));
ControllerUtil.writeFileToResponse(response,excelPath);
FileUtil.del(LocalFileUtil.getDefaultTempFolder() + File.separator);
} catch (Exception e) {
--
Gitblit v1.9.3