From e282b39a750d245f86a08194a6f4d02d545232ef Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 十一月 2024 10:47:36 +0800
Subject: [PATCH] 历史数据导入码值查重条件加上版次条件
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
index 01e36ad..1ab477f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
@@ -1,9 +1,6 @@
package com.vci.ubcs.code.wrapper;
-<<<<<<< Updated upstream
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-=======
->>>>>>> Stashed changes
import com.vci.ubcs.code.entity.CodeReferConfig;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.entity.CodeSrchCondConfig;
@@ -12,11 +9,8 @@
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;
@@ -37,7 +31,6 @@
@Override
public CodeSrchCondConfigVO entityVO(CodeSrchCondConfig codeSrchCondConfig) {
CodeSrchCondConfigVO codeSrchCondConfigVO = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfig, CodeSrchCondConfigVO.class));
-<<<<<<< Updated upstream
if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterType())){
codeSrchCondConfigVO.setFilterTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FILTER_TYPE,codeSrchCondConfig.getFilterType()));
}
@@ -56,15 +49,6 @@
codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
}
codeSrchCondConfig.setReferConfigOid(codeSrchCondConfigVO.getOid());
-=======
- codeSrchCondConfigVO.setFilterTypeText(CodeReferConfigFilterTypeEnum.getTextByValue(codeSrchCondConfig.getFilterType()));
- return codeSrchCondConfigVO;
- }
-
- public CodeSrchCondConfig entityDO(CodeSrchCondConfigVO codeSrchCondConfigVO) {
- CodeSrchCondConfig codeSrchCondConfig = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfigVO, CodeSrchCondConfig.class));
- codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
->>>>>>> Stashed changes
return codeSrchCondConfig;
}
@@ -72,11 +56,8 @@
return (List)codeSrchCondConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
}
-<<<<<<< Updated upstream
public List<CodeSrchCondConfig> listDO(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS,String oid) {
return (List)codeSrchCondConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
}
-=======
->>>>>>> Stashed changes
}
--
Gitblit v1.9.3