From 07c0815715b775e4b01116f575870ef85892d84a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 22 十月 2024 09:58:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index 0161a70..1ee2d5f 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -272,6 +272,9 @@
if(att == null || "".equals(att.oid)){
att = allSysAttr.get(column.toLowerCase());
}
+ if(att == null){
+ throw new PLException("500", new String[]{"灞炴�у瓧娈碉細" + column + "鍦ㄥ睘鎬ф睜涓湭鏌ヨ鍒帮紝璇风‘璁わ紒锛�"});
+ }
leafInfoDTO.setClause(leafInfo.getClause());
leafInfoDTO.setOperator(leafInfo.getOperator());
@@ -1476,6 +1479,7 @@
if(!checkInfo.equals("OK")){
throw new PLException("500", new String[]{checkInfo});
}
+ qt.setId(qtInfoDTO.getQtName());
//璁剧疆鎺掑簭淇℃伅
qt.setOrderInfoList(qtInfoDTO.getQueryTemplate().getOrderInfoList());
QTInfo qtWrapper = new QTInfo();
@@ -1556,9 +1560,10 @@
* @return
*/
@Override
- public void expBtmQTTemplate(List<String> names, HttpServletResponse response) throws PLException, IOException {
+ public String expBtmQTTemplate(String qtNames) throws PLException, IOException {
String defaultTempFolder = LocalFileUtil.getDefaultTempFolder();
String vciqtmfFileName = defaultTempFolder + File.separator + "BtmTemplateExp" + new Date().getTime() + ".vciqtf";
+ String[] names = qtNames.split(",");
BtmQTExportData exportData = new BtmQTExportData();
for (String name : names) {
QTInfo qt = platformClientUtil.getQTDService().getQT(name);
@@ -1588,8 +1593,9 @@
throw new PLException("500",new String[]{"瀵煎嚭娴佸叧闂紓甯革紒"});
}
}
- ControllerUtil.writeFileToResponse(response,vciqtmfFileName);
- FileUtil.del(defaultTempFolder + File.separator);
+ //ControllerUtil.writeFileToResponse(response,vciqtmfFileName);
+ //FileUtil.del(defaultTempFolder + File.separator);
+ return vciqtmfFileName;
}
/**
--
Gitblit v1.9.3