From 65df69ac23c18e05e75912484089529305c0e1dd Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期二, 16 五月 2023 18:19:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java index 4a60ab2..c5b577a 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeWrapper.java @@ -4,6 +4,7 @@ import com.vci.ubcs.omd.entity.BtmType; import com.vci.ubcs.omd.vo.BtmTypeVO; import com.vci.ubcs.starter.web.enumpck.BooleanEnum; +import com.vci.ubcs.starter.web.enumpck.NewAppConstantEnum; import com.vci.ubcs.starter.web.util.VciBaseUtil; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.secure.utils.AuthUtil; @@ -11,6 +12,7 @@ import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Objects; import java.util.stream.Collectors; @@ -33,12 +35,15 @@ @Override 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.setRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getRevisionFlag())); vo.setSecretFlag(BooleanEnum.TRUE.getValue().equals(entity.getSecretFlag())); vo.setLifeCycleFlag(BooleanEnum.TRUE.getValue().equals(entity.getLifeCycleFlag())); vo.setInputRevisionFlag(BooleanEnum.TRUE.getValue().equals(entity.getInputRevisionFlag())); vo.setViewFlag(BooleanEnum.TRUE.getValue().equalsIgnoreCase(entity.getViewFlag())); + vo.setViewText(vo.isViewFlag() ? "瑙嗗浘" : "闈炶鍥�"); vo.setAbstractFlag(BooleanEnum.TRUE.getValue().equals(entity.getAbstractFlag())); return vo; } -- Gitblit v1.9.3