From ba075b50ef7b8ef7265fb858a4223ba0a0ce76df Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 16:30:23 +0800
Subject: [PATCH] baseQueryCBO方法修改
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 45 +++++++++++++--------------------------------
1 files changed, 13 insertions(+), 32 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 8e14104..cb1e6e2 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -23,6 +23,7 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
@@ -39,6 +40,7 @@
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.common.*;
import plm.corba.qt.KV;
+import plm.corba.qt.QTServiceOperations;
import plm.oq.objectQuery.common.*;
import java.lang.reflect.Field;
@@ -612,8 +614,8 @@
//璁剧疆鍒嗛〉淇℃伅鍜屾帓搴�
setPageAndOrderToQT(qt,ph);
- //try {
- //QTServiceOperations qtService = platformClientUtil.getQueryService();
+ try {
+ // QTServiceOperations qtService = platformClientUtil.getQueryService();
ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
if(qtService == null){
logger.error("娌℃湁鎵惧埌鏌ヨ鏈嶅姟");
@@ -623,48 +625,27 @@
ObjectQueryService.FindBTMObjectsV3Result bos = null;
String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
try{
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<Data>\n" +
- " <QueryTemplate id=\"querySubFolder\" type=\"btm\">\n" +
- " <clauseList>querycondition,sequence,folderoid,folderbusinesstype,secretgrade,workcontextoid,checkoutby,revisionrule,hisattrvallist,isfirstv,lastmodifier,description,newattrvallist,oid,revisionid,revisionvalue,isfirstr,id,checkouttime,copyfromversion,owner,creator,checkintime,revisionseq,versionrule,versionvalue,versionseq,checkinby,lcstatus,createtime,lastmodifytime,lctid,name,islastr,nameoid,islastv,btmname,ts</clauseList>\n" +
- " <linkType></linkType>\n" +
- " <btmType>folder</btmType>\n" +
- " <queryChildrenFlag>false</queryChildrenFlag>\n" +
- " <queryISLeaf>false</queryISLeaf>\n" +
- " <rightFlag>false</rightFlag>\n" +
- " <secretFlag>true</secretFlag>\n" +
- " <version>0</version>\n" +
- " <levelRec>-1</levelRec>\n" +
- " <recReturnMode>1</recReturnMode>\n" +
- " <orderInfos>\n" +
- " <orderInfo>\n" +
- " <orderField>sequence</orderField>\n" +
- " <orderMode>ASC</orderMode>\n" +
- " <level>1</level>\n" +
- " </orderInfo>\n" +
- " </orderInfos>\n" +
- " </QueryTemplate>\n" +
- "</Data>";
//bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
}catch (VCIError e){
//bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
+ bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
}
-
if (bos != null && bos.count > 0) {
for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
ClientBusinessObject cbo = new ClientBusinessObject();
- //cbo.setBusinessObject(bo);
- //queryEnumText(cbo,enumAttrName);
+ BusinessObject businessObject = Func.copyProperties(bo, BusinessObject.class);
+ cbo.setBusinessObject(businessObject);
+ queryEnumText(cbo,enumAttrName);
allCbos.add(cbo);
}
//鍥犱负淇敼浜嗘煡璇㈢殑鏂瑰紡锛屾墍浠ュ氨涓嶉渶瑕佸崟鐙煡璇㈠弬鐓�
}
- //queryLcStatus(allCbos);
- //} //catch (VCIError e) {
-// // logger.error(e.error_code,e);
-// // hrow WebUtil.getVciBaseException(e);
-// }
+ queryLcStatus(allCbos);
+ } catch (VCIError e) {
+ //logger.error(e.error_code,e);
+ throw WebUtil.getVciBaseException(e);
+ }
return allCbos;
}
--
Gitblit v1.9.3