From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelFactory.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelFactory.java b/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelFactory.java
index 1a5c7ac..0d8c45c 100644
--- a/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelFactory.java
+++ b/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelFactory.java
@@ -26,6 +26,7 @@
import com.vci.corba.portal.data.PortalVI;
import com.vci.corba.query.data.RefPath;
import com.vci.client.common.oq.OQTool;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.client.omd.provider.ApProvider;
import com.vci.client.omd.provider.EnumProvider;
import com.vci.client.oq.QTClient;
@@ -132,7 +133,7 @@
PortalVI p = UITools.getService().getPortalVIById(datagridId);
PRM prm = UITools.getPRM(p.prm);
String queryTemplate = prm.getPrmItemList().get(0).getItemQtName();
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
QueryTemplate qt_ = OQTool.replaceQTValues(qt, replaceMap);
int total = (int)QTClient.getService().findTotalCount(qt_.getId(),OQTool.qtTOXMl(qt_).asXML());
@@ -143,7 +144,7 @@
PortalVI p = UITools.getService().getPortalVIById(datagridId);
PRM prm = UITools.getPRM(p.prm);
String queryTemplate = prm.getPrmItemList().get(0).getItemQtName();
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
QueryTemplate qt_ = OQTool.replaceQTValues(qt, replaceMap);
if (conditionsMap != null && conditionsMap.size() > 0) {
@@ -463,7 +464,7 @@
Map<String, Map<String, String>> rowRefMap, List<Map<String, String>> listMap, Map<String, String> replaceMap, Map<String, List<String>> selectValues,
Map<String, String> conditions, Map<String, String> orderMap, Map<String, String> columnTypeMap) throws VCIError, DocumentException {
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
//鏌ヨ鏁版嵁
Map<String, String> map = null;
--
Gitblit v1.9.3