From 5db4c4f167c5353c257c5b890b6ba6ccecbdfc07 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 十二月 2024 14:35:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
index 5eab0de..ce38cd4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
@@ -75,18 +75,25 @@
LO_BASE_FIELD_MAP.put("oid","oid");
LO_BASE_FIELD_MAP.put("creator","creator");
LO_BASE_FIELD_MAP.put("createTime","createTime");
- LO_BASE_FIELD_MAP.put("lastModifier","lastModifier");
- LO_BASE_FIELD_MAP.put("lastModifyTime","lastModifyTime");
+ //LO_BASE_FIELD_MAP.put("lastModifier","lastModifier");
+ //LO_BASE_FIELD_MAP.put("lastModifyTime","lastModifyTime");
+ LO_BASE_FIELD_MAP.put("modifier","lastModifier");
+ LO_BASE_FIELD_MAP.put("modifyTime","lastModifyTime");
LO_BASE_FIELD_MAP.put("fromOid","f_oid");
- LO_BASE_FIELD_MAP.put("fromRevisionOid","f_revisionoid");
+ //LO_BASE_FIELD_MAP.put("fromRevisionOid","f_revisionoid");
+ LO_BASE_FIELD_MAP.put("fromRevOid","f_revisionoid");
LO_BASE_FIELD_MAP.put("fromNameOid","f_nameoid");
- LO_BASE_FIELD_MAP.put("fromBTMName","f_btwname");
- LO_BASE_FIELD_MAP.put("toRevisionOid","t_revisionoid");
+ //LO_BASE_FIELD_MAP.put("fromBTMName","f_btwname");
+ LO_BASE_FIELD_MAP.put("fromBTName","f_btwname");
+ //LO_BASE_FIELD_MAP.put("toRevisionOid","t_revisionoid");
+ LO_BASE_FIELD_MAP.put("toRevOid","t_revisionoid");
LO_BASE_FIELD_MAP.put("toNameOid","t_nameoid");
- LO_BASE_FIELD_MAP.put("toBTMName","t_btwname");
+ //LO_BASE_FIELD_MAP.put("toBTMName","t_btwname");
+ LO_BASE_FIELD_MAP.put("toBTName","t_btwname");
LO_BASE_FIELD_MAP.put("toOid","t_oid");
LO_BASE_FIELD_MAP.put("ts","ts");
- LO_BASE_FIELD_MAP.put("linkTypeName","linkTypeName");
+ //LO_BASE_FIELD_MAP.put("linkTypeName","linkTypeName");
+ LO_BASE_FIELD_MAP.put("ltName","linkTypeName");
}
@@ -360,7 +367,12 @@
public Map clo2Map(LinkObject clo) throws VciBaseException {
Map<String,String> map = new HashMap<String, String>();
WebUtil.copyValueToMapFromClos(clo, map);
- return map;
+ //TODO:20241128 杩囨护鎺夌┖key鍜岀┖value
+ Map<String, Object> filteredClo2Map = map.entrySet()
+ .stream()
+ .filter(entry -> entry.getKey() != null && !entry.getKey().isEmpty() && entry.getValue() != null && !entry.getValue().toString().isEmpty())
+ .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+ return filteredClo2Map;
}
@Override
@@ -518,7 +530,7 @@
@Override
public List<com.vci.corba.query.data.BOAndLO> queryCLOAndBOBySchema(UILinkTypeDataQuery linkTypeDataQuery) {
VciBaseUtil.alertNotNull(linkTypeDataQuery,"閾炬帴绫诲瀷鏌ヨ瀵硅薄",linkTypeDataQuery.getQueryTemplateName(),"鏌ヨ妯℃澘鐨勫悕绉�");
- QueryTemplate qt =boService.getQtByName(linkTypeDataQuery.getQueryTemplateName(),linkTypeDataQuery.getReplaceMap());
+ QueryTemplate qt = boService.getQtByName(linkTypeDataQuery.getQueryTemplateName(),linkTypeDataQuery.getReplaceMap());
return queryCLOAndBOByQueryTemplate(qt,linkTypeDataQuery);
}
--
Gitblit v1.9.3