From 7577e0d40354021d70b78d58b712ff8c2e8ad485 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelProcessor.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelProcessor.java b/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelProcessor.java
index e1f6f53..a857cd6 100644
--- a/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelProcessor.java
+++ b/Source/Client/PLTClient/src/com/vci/client/portal/utility/DataModelProcessor.java
@@ -11,6 +11,7 @@
import org.dom4j.DocumentHelper;
import com.vci.client.common.oq.OQTool;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.client.oq.QTClient;
import com.vci.client.oq.QTDClient;
import com.vci.client.portal.constants.QueryConditionConstants;
@@ -631,7 +632,7 @@
public LinkObject[] getLinkObjectByQueryTemplate(String queryTemplate, Map<String, String> replaceMap) throws VCIError, DocumentException {
LinkObject[] linkObjects = null;
try{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
PageInfo pageInfo = null;
if(replaceMap.containsKey(QueryConditionConstants.PAGESIZE) && replaceMap.containsKey(QueryConditionConstants.PAGENO)){
@@ -746,7 +747,7 @@
QueryTemplate qt_ = null;
try
{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
PageInfo pageInfo = null;
if(replaceMap != null && replaceMap.containsKey(QueryConditionConstants.PAGESIZE) && replaceMap.containsKey(QueryConditionConstants.PAGENO)){
@@ -794,7 +795,7 @@
QueryTemplate qt_ = null;
try
{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
qt_ = OQTool.replaceQTValues(qt, replaceMap);
if (conditionMap != null && conditionMap.size() > 0) {
@@ -834,7 +835,7 @@
QueryTemplate qt_ = null;
try
{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
qt_ = OQTool.replaceQTValues(qt, replaceMap);
if (conditionMap != null && conditionMap.size() > 0) {
@@ -865,7 +866,7 @@
QueryTemplate qt_ = null;
try
{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
qt_ = OQTool.replaceQTValues(qt, replaceMap);
if (conditionMap != null && conditionMap.size() > 0) {
@@ -906,7 +907,7 @@
BusinessObject[] v = null;
try
{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplate);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplate);
if (replaceMap != null && replaceMap.size() > 0){
QueryTemplate qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplate);
PageInfo pageInfo = null;
--
Gitblit v1.9.3