From cdba4febf23c6f55346a474579361923aacf0bc9 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 02 十二月 2024 14:54:11 +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/OsQueryTemplateImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 f5a32e1..3bfea3b 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
@@ -98,7 +98,8 @@
}else {
qtdArray = platformClientUtil.getQTDService().getBizTypeQTDs(btmName);
}
- return BaseResult.dataList(Arrays.asList(qtdArray));
+ List<QTD> qtdList = Arrays.asList(qtdArray).stream().sorted(Comparator.comparing(s -> s.name,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
+ return BaseResult.dataList(qtdList);
}
/**
@@ -195,6 +196,9 @@
public BaseResult getObjTypeQTs(String btName) throws PLException, DocumentException {
VciBaseUtil.alertNotNull(btName,"绫诲瀷鍚�");
QTInfo[] objTypeQTs = platformClientUtil.getQTDService().getObjTypeQTs(btName);
+ if(Func.isEmpty(objTypeQTs)){
+ return BaseResult.success();
+ }
List<QTInfoDTO> dtos = new ArrayList<>();
Map<String, AttributeDef> allSysAttr = Arrays.stream(platformClientUtil.getBtmService().getSysAttributeDefs()).collect(Collectors.toMap(e -> e.name, e -> e));
allSysAttr.putAll(Arrays.stream(platformClientUtil.getLinkTypeService().getSysAttributeDefs()).collect(Collectors.toMap(e -> e.name, e -> e)));
@@ -216,6 +220,8 @@
qtInfoDTO.setCreateTimeText(DateFormatUtils.format(new Date(obj.createTime), DateUtil.PATTERN_DATETIME));
dtos.add(qtInfoDTO);
}
+ //// TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
+ dtos = dtos.stream().sorted(Comparator.comparing(QTInfoDTO::getQtName,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
return BaseResult.dataList(dtos);
}
@@ -1612,8 +1618,9 @@
@Override
public BaseResult getAllQTs() throws PLException {
QTInfo[] allQTs = platformClientUtil.getQTDService().getAllQTs();
+ List<QTInfo> allQTList = Arrays.stream(allQTs).sorted(Comparator.comparing(o -> o.qtName, String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
DataGrid<QTInfo> dataGrid = new DataGrid<>();
- dataGrid.setData(Arrays.asList(allQTs));
+ dataGrid.setData(allQTList);
dataGrid.setTotal(allQTs.length);
return BaseResult.dataGrid(dataGrid);
}
--
Gitblit v1.9.3