From bfa2d1307c6faea916088a40dc09a360b17f7499 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 30 六月 2023 18:04:33 +0800
Subject: [PATCH] 1、主要对查询返回数据进行联查

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 7374475..2aa4c91 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
 import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
@@ -11,15 +12,13 @@
 import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
 import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
 import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import com.vci.ubcs.starter.revision.model.TreeQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.*;
 import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
 import org.springblade.core.tool.api.R;
 
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -103,7 +102,7 @@
 	 * @param cboList    鏁版嵁鐨勫唴瀹�
 	 */
 	void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, /*List<ClientBusinessObject> cboList*/
-							 List<String> cboList);
+							 List<BaseModel> cboList);
 
 	/**
 	 * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
@@ -400,10 +399,9 @@
 	/**
 	 * 榛樿鍒楄〃
 	 * @param referConfigVO
-	 * @param pageHelper
 	 * @return
 	 */
-	DataGrid referDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper);
+	Page<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);
 
 
 	/**
@@ -413,6 +411,7 @@
 	 */
 	List<Tree> referTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject);
 
+
 	/**
 	 * 鏄惁涓轰慨鏀瑰拷鐣ョ殑灞炴��
 	 * @param attrName 灞炴�х殑鍚嶅瓧

--
Gitblit v1.9.3