Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java

@@ -29,6 +29,7 @@
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.DocumentException;
@@ -434,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);
@@ -1110,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);
@@ -1670,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);
@@ -1678,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());
@@ -1756,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();
@@ -1775,6 +1782,9 @@
                    //系统属性ID,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);