From 7fd952d115d4dfc4534b734e52474636b7688eaf Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期三, 05 七月 2023 17:33:16 +0800
Subject: [PATCH] 业务类型feign修正
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
index 52c6de9..f75ae74 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.omd.entity.BtmType;
@@ -77,12 +78,16 @@
String domainValue = conditionMap.get(DOMAIN);
VciBaseUtil.alertNotNull(domainValue,"棰嗗煙鍊�");
conditionMap.remove(DOMAIN);
- BtmType queryObj = new BtmType();
- BeanMap.create(queryObj).putAll(conditionMap);
+// BtmType queryObj = new BtmType();
+// BeanMap.create(queryObj).putAll(conditionMap);
+ Map<String, Object> condition = new HashMap<>(conditionMap);
Query query = new Query();
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
- IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
+ if (CollectionUtils.isEmpty(page.getRecords())){
+ return R.data(null);
+ }
Page<BtmTypeVO> pageVO = new Page<>();
BeanUtil.copy(page,pageVO);
pageVO.setRecords(BtmTypeWrapper.build().listEntityVO(page.getRecords()));
@@ -111,7 +116,10 @@
conditionMap.remove(DOMAIN);
BtmType queryObj = new BtmType();
BeanMap.create(queryObj).putAll(conditionMap);
- List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
+ List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getBizDomain, domainValue).orderByAsc(BtmType::getId));
+ if (CollectionUtils.isEmpty(list)){
+ return R.data(new ArrayList<>());
+ }
return R.data(BtmTypeWrapper.build().listEntityVO(list));
}
@@ -131,6 +139,9 @@
)
).orElseGet(ArrayList::new)
);
+ if (CollectionUtils.isEmpty(voList)){
+ return R.data(new ArrayList<>(),"鏆傛棤鏁版嵁鎵胯浇锛�");
+ }
return R.data(voList);
}
@@ -160,6 +171,7 @@
* @return 榛樿瀛楁灞炴��
*/
@Override
+ @GetMapping(GET_DEFAULT_ATTR_BY_BTM_ID)
public R<BtmTypeVO> getDefaultAttrByBtmId(String btmTypeId) {
return R.data(Optional.ofNullable(btmTypeService.getDefaultAttrByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
}
@@ -171,6 +183,7 @@
* @return 鎵�鏈夊瓧娈�
*/
@Override
+ @GetMapping(GET_ALL_ATTR_BY_BTM_ID)
public R<BtmTypeVO> getAllAttributeByBtmId(String btmTypeId) {
return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
}
@@ -182,6 +195,7 @@
* @return 鎵�鏈夊瓧娈�
*/
@Override
+ @GetMapping(GET_ALL_ATTR_BY_BTM_OID)
public R<BtmTypeVO> getAllAttributeByBtmOid(String btmTypeOid) {
return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmOid(btmTypeOid)).orElseGet(BtmTypeVO::new));
}
--
Gitblit v1.9.3