From 0a5f694065e3b4a85423ec2516b266881f10a9ee Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 05 九月 2023 20:18:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java index 93c2774..f4015eb 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingLog; +import com.vci.ubcs.code.enumpack.SysIntegrationLogTypeEnum; import com.vci.ubcs.code.vo.pagemodel.DockingLogeVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -18,6 +19,7 @@ @Override public DockingLogeVO entityVO(DockingLog entity) { + entity.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(entity.getType())); DockingLogeVO dockingLogeVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingLogeVO.class)); return dockingLogeVO; } @@ -33,6 +35,7 @@ List<DockingLogeVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(vo -> { + vo.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(vo.getType())); vos.add(entityVO(vo)); }); } @@ -49,6 +52,7 @@ List<DockingLog>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { + entity.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(entity.getType())); entitys.add(voentity(entity)); }); } @@ -61,6 +65,7 @@ * @return */ public DockingLog voentity( DockingLogeVO vo) { + vo.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(vo.getType())); DockingLog entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingLog.class)); return entity; } -- Gitblit v1.9.3