From a41d81627be8b9bd8294762e540d931ae75588a5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 17 四月 2024 10:32:16 +0800
Subject: [PATCH] 集团属性池映射界面代码完善
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
index f9574b3..e2aaccc 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.wrapper;
+import com.vci.ubcs.omd.cache.EnumCache;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
@@ -7,6 +8,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
import java.util.Date;
import java.util.List;
@@ -34,6 +36,7 @@
public BtmTypeAttributeVO entityVO(BtmTypeAttribute entity) {
BtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeAttributeVO.class));
// 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
+ vo.setAttrDataTypeText(EnumCache.getValue("attributeType",vo.getAttrDataType()));
return vo;
}
@@ -55,7 +58,9 @@
*/
public BtmTypeAttribute copyBtmTypeAttributeDTO2Entity(BtmTypeLinkAttributesDTO dto, String btmTypeOid, String creator, Date now){
BtmTypeAttribute entity = Objects.requireNonNull(BeanUtil.copy(dto, BtmTypeAttribute.class));
- entity.setOid(VciBaseUtil.getPk());
+ if (StringUtil.isBlank(entity.getOid())) {
+ entity.setOid(VciBaseUtil.getPk());
+ }
entity.setBtmName(BtmTypeConstant.BTM_TYPE_ATTRIBUTE);
entity.setOwner(creator);
entity.setCreator(creator);
@@ -63,6 +68,8 @@
entity.setLastModifier(creator);
entity.setLastModifyTime(now);
entity.setTs(now);
+ entity.setPrecisionLength(0);
+ entity.setScaleLength(0);
entity.setPkBtmType(btmTypeOid);
// 鍦ㄨ繖杩涜閫氱敤瀛楁澶勭悊
return entity;
--
Gitblit v1.9.3