From a3c7b3f7a4778a777a78a72c968b0e172488df03 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 06 六月 2023 17:13:05 +0800
Subject: [PATCH] 1、对MDM服务的接口测试改动
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
index 3014c3e..5889ca9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
@@ -1,5 +1,9 @@
package com.vci.ubcs.code.wrapper;
+<<<<<<< Updated upstream
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+=======
+>>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
import com.vci.ubcs.code.enumpack.CodeReferConfigFieldTypeEnum;
@@ -7,6 +11,11 @@
import com.vci.ubcs.code.vo.CodeReferConfigVO;
import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+<<<<<<< Updated upstream
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.enums.EnumEnum;
+=======
+>>>>>>> Stashed changes
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -27,19 +36,54 @@
@Override
public CodeShowFieldConfigVO entityVO(CodeShowFieldConfig codeShowFieldConfig) {
CodeShowFieldConfigVO codeShowFieldConfigVO = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfig, CodeShowFieldConfigVO.class));
+<<<<<<< Updated upstream
+ if(StringUtils.isNotBlank(codeShowFieldConfig.getFixedPosition())){
+ codeShowFieldConfigVO.setFixedPositionText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIXED,codeShowFieldConfig.getFixedPosition()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfig.getFieldType())){
+ codeShowFieldConfigVO.setFieldTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIELD_TYPE,codeShowFieldConfig.getFieldType()));
+ }
+ return codeShowFieldConfigVO;
+ }
+
+ public CodeShowFieldConfig entityDOsetReferConfigOid(CodeShowFieldConfigVO codeShowFieldConfigVO,String oid) {
+ CodeShowFieldConfig codeShowFieldConfig = entityDO(codeShowFieldConfigVO);
+ codeShowFieldConfig.setReferConfigOid(oid);
+ return codeShowFieldConfig;
+=======
codeShowFieldConfigVO.setFieldTypeText(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfig.getField()));
codeShowFieldConfigVO.setFixedPositionText(CodeReferConfigFixedEnum.getTextByValue(codeShowFieldConfig.getFixedPosition()));
return codeShowFieldConfigVO;
+>>>>>>> Stashed changes
}
public CodeShowFieldConfig entityDO(CodeShowFieldConfigVO codeShowFieldConfigVO) {
CodeShowFieldConfig codeShowFieldConfig = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfigVO, CodeShowFieldConfig.class));
+<<<<<<< Updated upstream
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
+ codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFixedPositionText())){
+ codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
+ }
+ if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
+ codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getValueByText(codeShowFieldConfigVO.getFieldTypeText()));
+ }
+ return codeShowFieldConfig;
+ }
+
+ public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS,String oid) {
+ return (List)codeShowFieldConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
+ }
+
+=======
codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
return codeShowFieldConfig;
}
+>>>>>>> Stashed changes
public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
return (List)codeShowFieldConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
--
Gitblit v1.9.3