From 70d3ac7bb6aa7f68309b2a6f77eca8ab52190dbd Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期三, 21 六月 2023 16:28:54 +0800
Subject: [PATCH] 操作流程
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 49 insertions(+), 3 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 997bea0..97373b4 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;
@@ -62,7 +63,7 @@
*/
@Override
@PostMapping(GET_REF_PAGE)
- public R<IPage<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
+ public R<Page<BtmTypeVO>> getRefPage(BaseQueryObject baseQueryObject) {
Map<String, String> conditionMap = baseQueryObject.getConditionMap();
if (conditionMap == null){
conditionMap = new HashMap<>(16);
@@ -83,10 +84,13 @@
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<BtmTypeVO> pageVO = new Page<>();
+ 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()));
- R<IPage<BtmTypeVO>> r = R.data(pageVO);
+ R<Page<BtmTypeVO>> r = R.data(pageVO);
r.setSuccess(true);
return r;
}
@@ -112,6 +116,9 @@
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));
+ if (CollectionUtils.isEmpty(list)){
+ return R.data(null);
+ }
return R.data(BtmTypeWrapper.build().listEntityVO(list));
}
@@ -131,6 +138,9 @@
)
).orElseGet(ArrayList::new)
);
+ if (CollectionUtils.isEmpty(voList)){
+ return R.data(null);
+ }
return R.data(voList);
}
@@ -150,6 +160,42 @@
)
).orElseGet(ArrayList::new)
);
+ if (CollectionUtils.isEmpty(voList)){
+ return R.data(null);
+ }
return R.data(voList);
}
+
+ /**
+ * 鑾峰彇涓氬姟绫诲瀷锛屽彧鏈夐粯璁ゅ瓧娈�
+ *
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 榛樿瀛楁灞炴��
+ */
+ @Override
+ public R<BtmTypeVO> getDefaultAttrByBtmId(String btmTypeId) {
+ return R.data(Optional.ofNullable(btmTypeService.getDefaultAttrByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
+ }
+
+ /**
+ * 鑾峰彇涓氬姟绫诲瀷锛屾湁鎵�鏈夌殑瀛楁
+ *
+ * @param btmTypeId 涓氬姟绫诲瀷id
+ * @return 鎵�鏈夊瓧娈�
+ */
+ @Override
+ public R<BtmTypeVO> getAllAttributeByBtmId(String btmTypeId) {
+ return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmId(btmTypeId)).orElseGet(BtmTypeVO::new));
+ }
+
+ /**
+ * 鑾峰彇涓氬姟绫诲瀷锛屾湁鎵�鏈夌殑瀛楁
+ *
+ * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
+ * @return 鎵�鏈夊瓧娈�
+ */
+ @Override
+ public R<BtmTypeVO> getAllAttributeByBtmOid(String btmTypeOid) {
+ return R.data(Optional.ofNullable(btmTypeService.getAllAttributeByBtmOid(btmTypeOid)).orElseGet(BtmTypeVO::new));
+ }
}
--
Gitblit v1.9.3