From a471b20fe8075a663f32b3a2ee0cd70c1c63baf7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 21:59:42 +0800
Subject: [PATCH] 业务类型查询：树查询修改，数据列表查询接口修改（处理模板套模板情况下freemarker表达式的替换处理）。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 2f0e998..f5a32e1 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
@@ -122,6 +122,7 @@
             throw new PLException("500", new String[]{"澧炲姞涓氬姟绫诲瀷鏌ヨ妯℃澘澶辫触"});
         }
     }
+
     /**
      * 淇敼鏌ヨ妯℃澘
      * @param qtd 鏌ヨ妯℃澘瀹炰綋绫�
@@ -161,6 +162,7 @@
             return BaseResult.fail("鍒犻櫎鏌ヨ妯℃澘澶辫触");
         }
     }
+
     /**
      * @param qtInfoDTO 浼犺緭鐨勬暟鎹璞★細
      *                linkTypeName 閾炬帴绫诲瀷銆�
@@ -271,6 +273,9 @@
                 AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(column);
                 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());
 
@@ -784,6 +789,7 @@
         }
         return ciMap;
     }
+
     /**
      * 鏍戝寲涓�涓煡璇㈡潯浠剁粍鑺傜偣
      * @param children
@@ -856,6 +862,7 @@
         }
         return ciList;
     }
+
     /**
      * 楂樼骇鏌ヨ
      * 鎶奛ode鍐呭瑙ｆ瀽鎴怌onditionItem
@@ -941,8 +948,6 @@
         return ci;
     }
 
-
-
     /**
      * 鑾峰彇鍙傜収鐨勬煡璇㈡ā鏉�
      * @param refAbName: 鍙傜収灞炴�у悕
@@ -1001,7 +1006,6 @@
         condition.setCIMap(ciMap);
         return qt;
     }
-
 
     /**
      * 杩斿洖鏌ヨ鐨勭増鏈�
@@ -1083,6 +1087,7 @@
         ControllerUtil.writeFileToResponse(response,vciqtmfFileName);
         FileUtil.del(defaultTempFolder + File.separator);
     }
+
     /**
      * 瀵煎叆閾炬帴绫诲瀷鏌ヨ妯℃澘
      * @param file 涓婁紶鐨勬枃浠�
@@ -1441,8 +1446,13 @@
             throw new PLException("500", new String[]{checkInfo});
         }
         qt.setId("qt1");
-        BusinessObject[] result = platformClientUtil.getQueryService().findBTMObjects(qt.getId(), OQTool.qtTOXMl(qt).asXML());
-        return BaseResult.dataList(Arrays.asList(result));
+        try {
+            BusinessObject[] result = platformClientUtil.getQueryService().findBTMObjects(qt.getId(), OQTool.qtTOXMl(qt).asXML());
+            return BaseResult.dataList(Arrays.asList(result));
+        }catch (Exception e){
+            String errorLog = "鏌ヨ鏃跺嚭鐜伴棶棰橈紝璇锋鏌ラ厤缃殑鏉′欢鏄惁瀛樺湪闂锛屽叿浣撳師鍥狅細"+VciBaseUtil.getExceptionMessage(e);
+            throw new VciBaseException(errorLog);
+        }
     }
 
     /**
@@ -1476,6 +1486,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();
@@ -1644,6 +1655,7 @@
         tree.put("children", childList);
         return BaseResult.success(tree);
     }
+
     /**
      * 鏌ヨ妯℃澘鐨勫垪琛ㄦ坊鍔犱簡瀛楁鐨勭浉鍏冲睘鎬�
      * @param btmName 绫诲瀷
@@ -1844,6 +1856,7 @@
             e.printStackTrace();
         }
     }
+
     // 鏁版嵁杩囨护
     private void addImportBtmData(BtmQTExportData qtExportData, List<BizType> ltsNew, List<QTInfo> qTWrapperNew,
                                Map<String/* 绫诲瀷鍚嶇О */, QTD[]/* 鏌ヨ妯℃澘瀹氫箟 */> norepQTDs) {

--
Gitblit v1.9.3