ludc
2024-12-04 787eeb2b2880490bcf2705dc8d35c9dd230dba35
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);
   }