From d0867c4d6a3a608b12002bf873a3616fdcf91dfe Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 29 五月 2023 18:42:32 +0800
Subject: [PATCH] 动态表单
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 154d4a0..266fe5a 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
@@ -6,7 +6,7 @@
import com.alibaba.nacos.api.exception.NacosException;
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.Attribute;
@@ -722,7 +722,7 @@
btmType.setOid(VciBaseUtil.getPk());
btmType.setTs(now);
btmType.setCreator(user);
- btmType.setBtmName("btmType");
+ btmType.setBtmName(BtmTypeConstant.BTMTYPE);
btmType.setCreateTime(now);
btmType.setDomain(domain);
btmType.setLastModifyTime(now);
@@ -737,8 +737,8 @@
}).map(attr -> {
// 娣诲姞灞炴�э紝1鏄牎楠岋紝2鏄坊鍔�
Attribute attribute = new Attribute();
- attribute.setKey(attr.getId());
- attribute.setLabel(attr.getName());
+ attribute.setId(attr.getId());
+ attribute.setName(attr.getName());
attribute.setTypeCode("attributeType");
attribute.setTypeKey(attr.getAttrDataType());
// attribute.setDictKey(attr.getAttrDataType());
@@ -751,10 +751,14 @@
attribute.setReferToId(attr.getReferBtmTypeId());
attribute.setReferToName(attr.getReferBtmTypeName());
attribute.setTs(now);
+ attribute.setOwner(user);
attribute.setCreateTime(now);
- attribute.setIsDeleted(0);
- attribute.setCreateUser(AuthUtil.getUserId());
- idAttrMap.put(attribute.getKey(),attribute);
+ attribute.setLastModifier(user);
+ attribute.setLastModifyTime(now);
+ attribute.setBtmName(BtmTypeConstant.ATTRIBUTE);
+ attribute.setCreator(user);
+ attribute.setOid(VciBaseUtil.getPk());
+ idAttrMap.put(attribute.getId(),attribute);
// 鍦ㄨ繖閲岀粰涓氬姟绫诲瀷璁剧疆鐗堟湰鎺у埗銆佺敓鍛藉懆鏈熸帶鍒躲�佸瘑绾ф帶鍒剁浉鍏崇殑淇℃伅
// 娣诲姞涓氬姟绫诲瀷鍜屽睘鎬х殑鍏崇郴
@@ -764,7 +768,6 @@
btmTypeAttribute.setCreateTime(now);
btmTypeAttribute.setLastModifier(user);
btmTypeAttribute.setLastModifyTime(now);
-// btmTypeAttribute.setBtmName("btmTypeAttribute");
btmTypeAttribute.setOid(VciBaseUtil.getPk());
btmTypeAttribute.setBtmName(btmType.getId());
btmTypeAttribute.setOwner(user);
@@ -778,7 +781,7 @@
btmType.setConsistence(BooleanEnum.TRUE.getValue());
btmList.add(btmType);
});
- List<Attribute> existAttr = attributeService.list(Wrappers.<Attribute>query().lambda().in(Attribute::getKey, attributeIds));
+ List<Attribute> existAttr = attributeService.list(Wrappers.<Attribute>query().lambda().in(Attribute::getId, attributeIds));
if (!CollectionUtils.isEmpty(btmList)){
baseMapper.batchInsert(btmList);
}
@@ -800,7 +803,7 @@
if (CollectionUtils.isEmpty(existAttr)){
attributeService.saveBatch(idAttrMap.values());
}else {
- List<Attribute> addList = idAttrMap.values().stream().filter(a -> existAttr.stream().noneMatch(b -> StringUtils.equals(a.getKey(), b.getKey()))).collect(Collectors.toList());
+ List<Attribute> addList = idAttrMap.values().stream().filter(a -> existAttr.stream().noneMatch(b -> StringUtils.equals(a.getId(), b.getId()))).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(addList)) {
attributeService.saveBatch(addList);
}
--
Gitblit v1.9.3