业务类型bug修正

 Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue

@@ -203,6 +203,7 @@
                    reserveSelection: true,
                    searchMenuSpan:8,
                    highlightCurrentRow: true,
                    rowKey: 'id',
                    column: [
                        {
                        label: '英文名称',
@@ -373,7 +374,9 @@
        },
        // 确认属性池勾选
        confirmSelectAttr(){
            if(!this.btmType.attributes){
            this.btmType.attributes = [];
            }
            this.attrRef.queryNotIn = "";
            this.attrRef.selectData.forEach(item => {
                this.btmType.attributes.push({

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/constant/BtmTypeFieldConstant.java

@@ -70,6 +70,7 @@
                this.put("lastmodifytime", "最后修改时间");
                this.put("ts", "时间戳");
                this.put("owner", "拥有者");
                this.put("tenentId","租户");
            }
        };
        BASE_MODEL_COMPATIBILITY_MAP = new HashMap() {

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java

@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.feign;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.omd.entity.BtmType;
@@ -83,6 +84,9 @@
        query.setSize(pageHelper.getLimit());
        query.setCurrent(pageHelper.getPage());
        IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
        if (CollectionUtils.isEmpty(page.getRecords())){
            return R.data(null);
        }
        Page<BtmTypeVO> pageVO = new Page<>();
        BeanUtil.copy(page,pageVO);
        pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
@@ -112,6 +116,9 @@
        BtmType queryObj = new BtmType();
        BeanMap.create(queryObj).putAll(conditionMap);
        List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
        if (CollectionUtils.isEmpty(list)){
            return R.data(null);
        }
        return R.data(BtmTypeWrapper.build().listEntityVO(list));
    }

@@ -131,6 +138,9 @@
                )
            ).orElseGet(ArrayList::new)
        );
        if (CollectionUtils.isEmpty(voList)){
            return R.data(null);
        }
        return R.data(voList);
    }

@@ -150,6 +160,9 @@
                )
            ).orElseGet(ArrayList::new)
        );
        if (CollectionUtils.isEmpty(voList)){
            return R.data(null);
        }
        return R.data(voList);
    }


 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java

@@ -110,7 +110,11 @@
    @Override
    public BtmTypeVO getBtmTypeByOid(String pkBtmType) throws ServiceException {
        Func.requireNotNull(pkBtmType,"业务类型主键不能为空");
        BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(baseMapper.selectOne(Wrappers.<BtmType>query().lambda().eq(BtmType::getOid, pkBtmType)));
        BtmType queryBtmType = baseMapper.selectOne(Wrappers.<BtmType>query().lambda().eq(BtmType::getOid, pkBtmType));
        if (queryBtmType == null){
            return null;
        }
        BtmTypeVO btmTypeVO = BtmTypeWrapper.build().entityVO(queryBtmType);
        btmTypeVO.setAttributes(btmTypeAttributeService.getAttributeByBtmTypeOid(pkBtmType));
        return btmTypeVO;
    }

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java

@@ -37,7 +37,7 @@
    public BtmTypeVO entityVO(BtmType entity) {
        BtmTypeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeVO.class));
        vo.setDomainText(NewAppConstantEnum.getTextByName(vo.getDomain()));
        vo.setTableName(vo.getTableName().toUpperCase(Locale.ROOT));
        vo.setTableName(vo.getTableName() == null? "" : vo.getTableName().toUpperCase(Locale.ROOT));
        // 在这里设置枚举显示值
        vo.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag()));
        vo.setSecretFlag(BooleanEnum.TRUE.getValue().equals(entity.getSecretFlag()));