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/oq/ui/ConditionPanel.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/Client/PLTClient/src/com/vci/client/oq/ui/ConditionPanel.java b/Source/Client/PLTClient/src/com/vci/client/oq/ui/ConditionPanel.java
index 2afd140..d40e246 100644
--- a/Source/Client/PLTClient/src/com/vci/client/oq/ui/ConditionPanel.java
+++ b/Source/Client/PLTClient/src/com/vci/client/oq/ui/ConditionPanel.java
@@ -66,6 +66,7 @@
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.omd.objects.OtherInfo;
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.LinkTypeProvider;
import com.vci.client.oq.QTClient;
@@ -383,12 +384,12 @@
if(isForRight){
if(rdBtm.isSelected()){
- qtdArray = QTDClient.getService().getBizTypeQTDs(btmName);
+ qtdArray = ServiceProvider.getOMDService().getQTDService().getBizTypeQTDs(btmName);
}else if(rdLinkType.isSelected()){
List<QTD> qtdList = new ArrayList<QTD>();
LinkType[] linkTypes = LinkTypeProvider.getInstance().getLinkTypeByBtmName(btmName, "from");
for(int i = 0; i < linkTypes.length; i++){
- QTD[] qtds = QTDClient.getService().getLinkTypeQTDs(linkTypes[i].name);
+ QTD[] qtds = ServiceProvider.getOMDService().getQTDService().getLinkTypeQTDs(linkTypes[i].name);
for(int k = 0; k < qtds.length; k++){
qtdList.add(qtds[k]);
}
@@ -396,7 +397,7 @@
qtdArray = qtdList.toArray(new QTD[0]);
}
}else{
- qtdArray = QTDClient.getService().getBizTypeQTDs(btmName);
+ qtdArray = ServiceProvider.getOMDService().getQTDService().getBizTypeQTDs(btmName);
}
} catch (VCIError e) {
e.printStackTrace();
@@ -992,7 +993,7 @@
String QTname = values[0];
String attr = values[1].substring(0, values[1].length());
try {
- QTInfo qt = QTDClient.getService().getQT(QTname);
+ QTInfo qt = ServiceProvider.getOMDService().getQTDService().getQT(QTname);
String qtText = qt.qtText;
QueryTemplate qt_ = OQTool.getQTByQTText(qt.qtName, qtText);
List<String> clauseList = new ArrayList<String>();
--
Gitblit v1.9.3