From e5748ecbc12ea91d702e61af9a19667d19d19510 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 29 五月 2023 17:55:16 +0800 Subject: [PATCH] 动态表格组件更新 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 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 6d26fdb..e8ba21f 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,12 +1,13 @@ package com.vci.ubcs.code.wrapper; -import com.vci.ubcs.code.entity.CodePhaseAttr; 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.code.vo.pagemodel.CodePhaseAttrVO; 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; /** @@ -17,7 +18,6 @@ */ public class CodeReferConfigWraper extends BaseEntityWrapper<CodeReferConfig, CodeReferConfigVO> { - public static CodeReferConfigWraper build() { return new CodeReferConfigWraper(); } @@ -25,11 +25,16 @@ @Override public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) { CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class)); - - + codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType())); + if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){ + codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs())); + } + if(Func.isNotEmpty(codeReferConfig.getCodeShowFieldConfigs())){ + codeReferConfigVO.setCodeShowFieldConfigVOS(CodeShowFieldConfigWraper.build().listVO(codeReferConfig.getCodeShowFieldConfigs())); + } + codeReferConfigVO.setCodeShowFieldConfigs(null); + codeReferConfigVO.setCodeSrchCondConfigs(null); return codeReferConfigVO; } - - } -- Gitblit v1.9.3