From dfb9b1cc0b412334d0ab7891caac061a8243a0cb Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 06 六月 2023 17:03:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 71efccf..2e28e85 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,11 +1,17 @@
package com.vci.ubcs.code.wrapper;
+<<<<<<< Updated upstream
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 com.vci.ubcs.code.entity.CodeReferConfig;
+import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
+import com.vci.ubcs.code.vo.CodeReferConfigVO;
+>>>>>>> Stashed changes
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
@@ -29,9 +35,13 @@
@Override
public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) {
CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class));
+<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeReferConfig.getType())){
codeReferConfigVO.setTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_TYPE,codeReferConfig.getType()));
}
+=======
+ codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType()));
+>>>>>>> Stashed changes
if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs()));
}
@@ -43,6 +53,7 @@
return codeReferConfigVO;
}
+<<<<<<< Updated upstream
public CodeReferConfig entityDO(CodeReferConfigVO codeReferConfigVO) {
CodeReferConfig codeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
//codeReferConfig.setType(CodeReferConfigTypeEnum.getValueByText(codeReferConfigVO.getTypeText()));
@@ -57,4 +68,6 @@
return codeReferConfig;
}
+=======
+>>>>>>> Stashed changes
}
--
Gitblit v1.9.3