From 235560b9d7cff1d7dce1f90a08df56d6ef8dd682 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index ee01f3b..f8d3d40 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -12,10 +12,9 @@
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.ControllerUtil;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -531,4 +530,25 @@
// return engineService.updateBatchByBaseModel("wupin", models);
// return engineService.getUIInfoByClassifyOid(codeClassifyOid,functionId);
}
+
+ /**
+ * 榛樿鐨勫弬鐓у垪琛�
+ * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭�
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @GetMapping("/defaultReferDataGrid")
+ public DataGrid defaultReferDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper){
+ return engineService.referDataGrid(referConfigVO,pageHelper);
+ }
+
+ /**
+ * 榛樿鐨勬爲褰㈠弬鐓у垪琛�
+ * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭�
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @GetMapping("/defaultReferTree")
+ public List<Tree> defaultReferTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject){
+ return engineService.referTree(referConfigVO,queryObject);
+ }
+
}
--
Gitblit v1.9.3