From b1b6f3725d5abd7d366289c94bf8d71eb9180043 Mon Sep 17 00:00:00 2001
From: mamc <1428594221@qq.com>
Date: 星期三, 28 六月 2023 14:43:20 +0800
Subject: [PATCH] 默认参照列表接口修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 8cf14fa..97337aa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -3368,7 +3368,7 @@
* @return 鍒楄〃鏁版嵁
*/
@Override
- public DataGrid<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) {
+ public Page<BaseModel>referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) {
// checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
@@ -3386,13 +3386,6 @@
BtmTypeLcStatusConstant.RELEASE_LIFE_CYCLE.equalsIgnoreCase(btmTypeVO.getLifeCycleId())) {
baseQueryObject.getConditionMap().put(VciQueryWrapperForDO.LC_STATUS_FIELD, CodeDefaultLC.RELEASED.getValue());
}
-// baseQueryObject.getConditionMap().put("domain", AppConstant.APPLICATION_NAME_CODE);
-// R<Page<BtmTypeVO>> refPage = btmTypeClient.getRefPage(baseQueryObject);
-//
-// if (refPage.getCode() != 200) {
-// throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒");
-// }
-
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
if (listR.getData().size() == 0) {
throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
@@ -3468,13 +3461,10 @@
+ "and lastv =" + VciBaseUtil.toInSql(baseQueryObject.getConditionMap().get("lastv").toString())
+ lcstatusSql + namesql + codesql
);
-
- DataGrid<BaseModel> objectDataGrid = new DataGrid<>();
- objectDataGrid.setPage(baseQueryObject.getPage());
- objectDataGrid.setData(baseModels);
- objectDataGrid.setLimit(baseQueryObject.getLimit());
- objectDataGrid.setTotal(total);
- return objectDataGrid;
+ Page<BaseModel>page=new Page<>();
+ page.setRecords(baseModels);
+ page.setTotal(total);
+ return page;
}
/**
--
Gitblit v1.9.3