From f49622515192a11878628b8eecbc7315671ae562 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 09 一月 2025 15:25:25 +0800
Subject: [PATCH] 在获取相关业务类型下的属性时，未在属性中定义的数据直接跳过
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index 518e1a5..666d847 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -1,11 +1,8 @@
package com.vci.web.service.impl;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSONObject;
-import com.vci.client.ClientSession;
import com.vci.client.common.oq.OQTool;
-import com.vci.client.common.providers.ClientServiceProvider;
import com.vci.common.qt.object.*;
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
@@ -19,42 +16,32 @@
import com.vci.dto.*;
import com.vci.omd.constants.SystemAttribute;
import com.vci.omd.objects.OtherInfo;
-import com.vci.po.OsLinkTypePO;
-import com.vci.starter.poi.bo.ReadExcelOption;
-import com.vci.starter.poi.bo.WriteExcelData;
-import com.vci.starter.poi.bo.WriteExcelOption;
-import com.vci.starter.poi.constant.ExcelLangCodeConstant;
-import com.vci.starter.poi.util.ExcelUtil;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.util.*;
+import com.vci.starter.web.util.ControllerUtil;
+import com.vci.starter.web.util.Lcm.DateUtil;
+import com.vci.starter.web.util.Lcm.Func;
+import com.vci.starter.web.util.LocalFileUtil;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.other.BtmQTExportData;
import com.vci.web.other.LinkQTExportData;
-import com.vci.web.service.*;
-import com.vci.web.util.DateUtil;
-import com.vci.web.util.Func;
+import com.vci.web.service.OsQuereyTemplateServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
+import com.vci.web.utility.AttributeDataFetcher;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
-import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
-import org.jdesktop.swingx.JXDatePicker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
-import javax.swing.*;
-import java.awt.*;
import java.io.*;
import java.util.*;
-import java.util.List;
import java.util.stream.Collectors;
/**
@@ -448,7 +435,7 @@
//娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
for (LinkType plAction : linkTypes) {
HashMap<String,Object> childTree = new HashMap();
- childTree.put("text", plAction.tag + "/" +plAction.name);
+ childTree.put("text", plAction.label + "/" +plAction.name);
childTree.put("oid", plAction.oid);
// tree.put("children", childTree);
addExportTreeNode(plAction, qts, childTree);
@@ -1124,7 +1111,7 @@
//娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
for (LinkType plAction : ltsNew) {
HashMap<String,Object> childTree = new HashMap();
- childTree.put("text", plAction.tag + "/" +plAction.name);
+ childTree.put("text", plAction.label + "/" +plAction.name);
childTree.put("oid", plAction.oid);
addExportTreeNode(plAction, qts, childTree);
childList.add(childTree);
@@ -1684,6 +1671,8 @@
}else {
qtdArray = platformClientUtil.getQTDService().getBizTypeQTDs(btmName);
}
+ //鑾峰彇灞炴�х殑鏁版嵁鍔犺浇绫�
+ AttributeDataFetcher attrDataFetcher = new AttributeDataFetcher();
for (QTD qtd : qtdArray) {
QTDDTO qtddto = new QTDDTO();
qtddto.setName(qtd.name);
@@ -1692,7 +1681,8 @@
qtddto.setBtmName(qtd.btmName);
qtddto.setCreator(qtd.creator);
for (String abName : qtd.abNames) {
- AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName);
+ //AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName);
+ AttributeDef att = attrDataFetcher.getAttributeDef(abName);
//濡傛灉鍦ㄥ睘鎬ф帴鍙ｄ腑娌℃湁鏌ュ埌鐩稿叧瀛楁搴旇灏卞湪榛樿瀛楁涓�
if(att == null || "".equals(att.oid)){
att = allSysAttr.get(abName.toLowerCase());
@@ -1770,6 +1760,9 @@
AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName_);
if(att == null || "".equals(att.oid)){
att = allSysAttr.get(abName_.toLowerCase());
+ if(att == null || "".equals(att.oid)){
+ continue;
+ }
}
att.name = pName + abName_ ;
AttributeDefDTO attrDto = new AttributeDefDTO();
@@ -1789,6 +1782,9 @@
//绯荤粺灞炴�D,NAME,DESCRIPTION
for (int i = 0; i < SystemAttribute.bosysAttList().size(); i++) {
AttributeDef attributeDef = allSysAttr.get(SystemAttribute.bosysAttList().get(i).toLowerCase());
+ if(Func.isEmpty(attributeDef)){
+ break;
+ }
AttributeDefDTO attrDto = new AttributeDefDTO();
attrDto.setDescription(attributeDef.description);
attrDto.setLabel(attributeDef.label);
--
Gitblit v1.9.3