From aee67ef5bf2e57a148bfded1cb986378e35e7e01 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 四月 2024 00:49:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index cc1ae87..bb016e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -7,10 +7,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.constant.BtmTypeFieldConstant;
import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO;
import com.vci.ubcs.omd.entity.*;
+import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.repeater.DomainRepeater;
import com.vci.ubcs.omd.service.*;
import com.vci.ubcs.omd.vo.*;
@@ -985,7 +987,7 @@
BtmTypeAttributeVO vo = new BtmTypeAttributeVO();
vo.setId(id);
vo.setName(name);
- vo.setIseDfaultAttr(true);
+ vo.setIsDefaultAttr(true);
if ("oid".equals(id)){
vo.setNullableFlag(false);
}
@@ -1004,7 +1006,7 @@
BtmTypeAttributeVO vo = new BtmTypeAttributeVO();
vo.setId(id);
vo.setName(name);
- vo.setIseDfaultAttr(false);
+ vo.setIsDefaultAttr(false);
if (Arrays.asList("codeclsfpath").contains(id)){
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
vo.setAttributeLength(500);
@@ -1026,7 +1028,7 @@
// 鐗堟湰瑙勫垯瀛楁涓嶈兘涓虹┖
// vo.setNullableFlag(false);
vo.setAttributeLength(150);
- vo.setIseDfaultAttr(true);
+ vo.setIsDefaultAttr(true);
if (Arrays.asList("revisionseq","versionseq").contains(id)){
vo.setAttributeLength(5);
vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
@@ -1046,14 +1048,21 @@
vo.setId(id);
vo.setName(name);
// vo.setNullableFlag(false);
- vo.setIseDfaultAttr(true);
+ vo.setIsDefaultAttr(true);
vo.setAttributeLength(50);
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
list.add(vo);
});
}
- return list;
+ // 璁剧疆瀛楁绫诲瀷涓枃鏄剧ず鍊�,鍜屾帓搴�
+ List<BtmTypeAttributeVO> sortedList = list.stream()
+ .sorted(Comparator.comparing(BtmTypeAttributeVO::getIsDefaultAttr))
+ .map(item-> {
+ item.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE, item.getAttrDataType()));
+ return item;
+ }).collect(Collectors.toList());
+ return sortedList;
}
}
--
Gitblit v1.9.3