From e9b405657b6117a8dcfcf8505cfd5d6eccd39cc8 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 30 五月 2023 18:32:57 +0800 Subject: [PATCH] code服务中部分do转vo时显示值转换改为缓存中拿值 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java index f4f4a7f..1ab477f 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java @@ -1,5 +1,6 @@ package com.vci.ubcs.code.wrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.vci.ubcs.code.entity.CodeReferConfig; import com.vci.ubcs.code.entity.CodeShowFieldConfig; import com.vci.ubcs.code.entity.CodeSrchCondConfig; @@ -8,6 +9,8 @@ import com.vci.ubcs.code.vo.CodeReferConfigVO; import com.vci.ubcs.code.vo.CodeShowFieldConfigVO; import com.vci.ubcs.code.vo.CodeSrchCondConfigVO; +import com.vci.ubcs.omd.cache.EnumCache; +import com.vci.ubcs.omd.enums.EnumEnum; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -28,13 +31,24 @@ @Override public CodeSrchCondConfigVO entityVO(CodeSrchCondConfig codeSrchCondConfig) { CodeSrchCondConfigVO codeSrchCondConfigVO = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfig, CodeSrchCondConfigVO.class)); - codeSrchCondConfigVO.setFilterTypeText(CodeReferConfigFilterTypeEnum.getTextByValue(codeSrchCondConfig.getFilterType())); + if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterType())){ + codeSrchCondConfigVO.setFilterTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FILTER_TYPE,codeSrchCondConfig.getFilterType())); + } return codeSrchCondConfigVO; + } + + public CodeSrchCondConfig entityDOsetReferConfigOid(CodeSrchCondConfigVO codeSrchCondConfigVO,String oid) { + CodeSrchCondConfig codeSrchCondConfig = entityDO(codeSrchCondConfigVO); + codeSrchCondConfig.setReferConfigOid(oid); + return codeSrchCondConfig; } public CodeSrchCondConfig entityDO(CodeSrchCondConfigVO codeSrchCondConfigVO) { CodeSrchCondConfig codeSrchCondConfig = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfigVO, CodeSrchCondConfig.class)); - codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText())); + if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterTypeText())){ + codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText())); + } + codeSrchCondConfig.setReferConfigOid(codeSrchCondConfigVO.getOid()); return codeSrchCondConfig; } @@ -42,4 +56,8 @@ return (List)codeSrchCondConfigVOS.stream().map(this::entityDO).collect(Collectors.toList()); } + public List<CodeSrchCondConfig> listDO(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS,String oid) { + return (List)codeSrchCondConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList()); + } + } -- Gitblit v1.9.3