From 75e0307428bdd1a16b9ff5b2a927620eec0ac41c Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 23 五月 2023 17:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 5625897..1999394 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
@@ -14,6 +14,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@@ -41,6 +42,7 @@
* @return 涓氬姟绫诲瀷璇︽儏淇℃伅
*/
@Override
+ @GetMapping(GET_DETAIL)
public R<BtmTypeVO> getDetail(String oid) {
return R.data(btmTypeService.getBtmTypeByOid(oid));
}
@@ -54,7 +56,8 @@
* @return 鏌ヨ缁撴灉
*/
@Override
- public R<IPage<BtmTypeVO>> getRef(Map<String, Object> condition, Query query, String domain) {
+ @GetMapping(GET_REF_PAGE)
+ public R<IPage<BtmTypeVO>> getRefPage(Map<String, Object> condition, Query query, String domain) {
Func.requireNotNull(domain,"棰嗗煙鍊�");
IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
IPage<BtmTypeVO> pageVO = new Page<>();
@@ -66,12 +69,28 @@
}
/**
+ * 鍙傜収鍒楄〃鏌ヨ
+ *
+ * @param condition 鏌ヨ鏉′欢
+ * @param domain 棰嗗煙鍊�
+ * @return 鏌ヨ缁撴灉
+ */
+ @Override
+ @GetMapping(GET_REF)
+ public R<List<BtmTypeVO>> getRef(Map<String, Object> condition, String domain) {
+ Func.requireNotNull(domain,"棰嗗煙鍊�");
+ List<BtmType> list = btmTypeService.list(Condition.getQueryWrapper(condition, BtmType.class).lambda().eq(BtmType::getDomain, domain).orderByAsc(BtmType::getId));
+ return R.data(BtmTypeWrapper.build().listEntityVO(list));
+ }
+
+ /**
* 鏍规嵁鑻辨枃鍚嶇О鎵归噺鏌ヨ瀵硅薄
*
* @param ids 瀵硅薄鑻辨枃鍚嶇О 浣嗘槸涓嶈兘瓒呰繃1000
* @return 涓氬姟瀵硅薄
*/
@Override
+ @GetMapping(GET_BY_IDS)
public R<List<BtmTypeVO>> selectByIdCollection(List<String> ids) {
Func.requireNotNull(ids,"涓氬姟绫诲瀷鑻辨枃鍚嶇О");
List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
@@ -90,6 +109,7 @@
* @return 涓氬姟绫诲瀷鍒楄〃锛屽鏋滄湁涓嶅瓨鍦ㄧ殑涓嶄細杩斿洖锛屽叏閮ㄤ笉瀛樺湪鐨勫垯杩斿洖绌哄垪琛�
*/
@Override
+ @GetMapping(GET_BY_OIDS)
public R<List<BtmTypeVO>> listBtmTypeByOidCollection(Collection<String> pkBtmTypeCollection) {
Func.requireNotNull(pkBtmTypeCollection,"涓氬姟绫诲瀷涓婚敭");
List<BtmTypeVO> voList = BtmTypeWrapper.build().listEntityVO(
--
Gitblit v1.9.3