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/CodeReferConfigWraper.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java index e8ba21f..71efccf 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java @@ -1,14 +1,18 @@ 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.enumpack.CodeReferConfigTypeEnum; import com.vci.ubcs.code.vo.CodeReferConfigVO; +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; import org.springblade.core.tool.utils.Func; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 鍙傜収閰嶇疆-鍖呰绫�,杩斿洖瑙嗗浘灞傛墍闇�鐨勫瓧娈� @@ -25,7 +29,9 @@ @Override public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) { CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class)); - codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType())); + if(StringUtils.isNotBlank(codeReferConfig.getType())){ + codeReferConfigVO.setTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_TYPE,codeReferConfig.getType())); + } if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){ codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs())); } @@ -37,4 +43,18 @@ return codeReferConfigVO; } + public CodeReferConfig entityDO(CodeReferConfigVO codeReferConfigVO) { + CodeReferConfig codeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class)); + //codeReferConfig.setType(CodeReferConfigTypeEnum.getValueByText(codeReferConfigVO.getTypeText())); + if(Func.isNotEmpty(codeReferConfigVO.getCodeSrchCondConfigVOS())){ + codeReferConfig.setCodeSrchCondConfigs(CodeSrchCondConfigWraper.build().listDO(codeReferConfigVO.getCodeSrchCondConfigVOS())); + } + if(Func.isNotEmpty(codeReferConfigVO.getCodeShowFieldConfigVOS())){ + codeReferConfig.setCodeShowFieldConfigs(CodeShowFieldConfigWraper.build().listDO(codeReferConfigVO.getCodeShowFieldConfigVOS())); + } + // codeReferConfigVO.setCodeSrchCondConfigVOS(null); + // codeReferConfigVO.setCodeShowFieldConfigVOS(null); + return codeReferConfig; + } + } -- Gitblit v1.9.3