From 2cf5e23d090699eae061564b77988a4ef485d1bb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 11:48:23 +0800
Subject: [PATCH] 集成获取分类接口（包含编码规则码段码值信息）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 17 +++++++++++++++--
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java | 5 +++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
index 7a2fbf4..809d0f4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -109,8 +109,9 @@
if (!Func.isEmpty(query)) {
query.forEach((k, v) -> {
- sb.append(" and ");
- if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+
+ if (!Func.hasEmpty(new Object[]{k, v})) {
+ sb.append(" and ");
if (k.endsWith(LIKE)) {
sb.append(likeValueSqlwhere(getColumn(k,LIKE),v,SqlLike.DEFAULT));
} else if (k.endsWith(NOT_EQUAL)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index bad631d..c47f444 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
@@ -38,7 +37,6 @@
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.UBCSSqlKeyword;
@@ -53,6 +51,7 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
@@ -979,6 +978,20 @@
sb.append( buildSqlwhere );
}
List<Map> ListMap= commonsMapper.selectBySql(sb.toString());
+ String valueField=coderefersecSearchVO.getValueField();
+ String textField=coderefersecSearchVO.getTextField();
+ final int[] num = {0};
+ if(!CollectionUtils.isEmpty(ListMap)){
+ ListMap.stream().forEach(map->{
+ num[0]++;
+ String id= map.getOrDefault("OID".toUpperCase(Locale.ROOT),"").toString();
+ String value= map.getOrDefault(valueField.toUpperCase(Locale.ROOT),"").toString();
+ String text=map.getOrDefault(textField.toUpperCase(Locale.ROOT),"").toString();
+ String description=map.getOrDefault("description".toUpperCase(Locale.ROOT),"").toString();
+ CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id, num[0]+"",value,text,"",description);
+ codeSectionValueVOList.add(sectionValueVO);
+ });
+ }
log.info(libId);
}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
int level = codeBasicSecVO.getCodeLevelValue();
--
Gitblit v1.9.3