From f3c411d4ddc5d1ebf7414103b1bc0d09b929c413 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 20 四月 2023 10:37:58 +0800 Subject: [PATCH] 联调修改codebasic,以及代码合并 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java index a31cd33..3e2edaa 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java @@ -18,7 +18,7 @@ */ import com.vci.ubcs.code.entity.CodeBasicSec; -import com.vci.ubcs.code.enumpack.CodeSecTypeEnum; +import com.vci.ubcs.code.enumpack.*; import com.vci.ubcs.code.lifecycle.CodeRuleLC; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; import org.springblade.core.mp.support.BaseEntityWrapper; @@ -43,11 +43,15 @@ @Override public CodeBasicSecVO entityVO(CodeBasicSec codeBasicSec) { CodeBasicSecVO codeBasicSecVO = Objects.requireNonNull(BeanUtil.copy(codeBasicSec, CodeBasicSecVO.class)); - codeBasicSecVO.setLcStatusText(CodeRuleLC.getTextByValue(codeBasicSec.getLcStatus())); - codeBasicSecVO.setSectypeText(CodeSecTypeEnum.getTextByValue(codeBasicSec.getSecType())); - //User createUser = UserCache.getUser(CodeAllCode.getCreateUser()); - //User updateUser = UserCache.getUser(CodeAllCode.getUpdateUser()); + //codeBasicSecVO.setLcStatusText(CodeRuleLC.getTextByValue(codeBasicSec.getLcStatus())); + codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSec.getSecType())); + codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSec.getCodeLevelType())); + codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSec.getCodeSecLengthType())); + codeBasicSecVO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSec.getValueCutType())); + codeBasicSecVO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSec.getCodeGetValueType())); + //codeBasicSecVO.setParentClassifySecText(); + //codeBasicSecVO.setSecretGradeText(); return codeBasicSecVO; } -- Gitblit v1.9.3