From 1157e8e97e24ec7938deea2e3345a502644fc256 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 05 七月 2023 16:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index af80c13..22b90ed 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -60,7 +60,7 @@
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
- attributeIdList.add(s.getId().toLowerCase().trim());
+ attributeIdList.add(s.getId().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
boolean exists = attributeService.checkAttributeExists(attributeIdList);
@@ -177,7 +177,7 @@
/**
* 鑾峰彇榛樿瀛楁
- *
+ * 榛樿瀛楁鍧囦笉鍙负绌�
* @param btmType 涓氬姟绫诲瀷
* @return 鎵ц缁撴灉
*/
@@ -186,14 +186,13 @@
List<BtmTypeAttributeVO> list = new ArrayList<>();
// 涓氬姟绫诲瀷鐨勫熀鏈瓧娈�
BtmTypeFieldConstant.BASIC_FIELD_MAP.forEach((id,name) -> {
+ id = id.toLowerCase(Locale.ROOT);
BtmTypeAttributeVO vo = new BtmTypeAttributeVO();
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
- if (StringUtils.equals(id,"oid")){
+ if ("oid".equals(id)){
vo.setNullableFlag(false);
- }else {
- vo.setNullableFlag(true);
}
if (Arrays.asList("createtime","lastmodifytime","owner").contains(id)){
vo.setAttrDataType(VciFieldTypeEnum.VTDateTime.name());
@@ -213,6 +212,8 @@
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ // 鐗堟湰瑙勫垯瀛楁涓嶈兘涓虹┖
+ vo.setNullableFlag(false);
vo.setAttributeLength(150);
if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq","revisionvalue","versionvalue").contains(id)){
vo.setAttributeLength(5);
@@ -233,6 +234,7 @@
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
+ vo.setNullableFlag(false);
vo.setAttributeLength(50);
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
list.add(vo);
@@ -246,6 +248,7 @@
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
+ vo.setNullableFlag(false);
vo.setAttributeLength(5);
vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
list.add(vo);
--
Gitblit v1.9.3