From 1bccfb0296202ecde9c59fd8a16c3d198210319c Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 03 七月 2023 18:53:27 +0800 Subject: [PATCH] 依赖修改，部分不兼容关键字修改，SQL、 --- 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 0be0ac9..7ff87cc 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,8 @@ package com.vci.ubcs.code.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 +13,14 @@ 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.exception.VciBaseException; 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; @@ -400,11 +401,9 @@ /** * 榛樿鍒楄〃 * @param referConfigVO - * @param pageHelper * @return */ - DataGrid referDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper); - + IPage<BaseModel> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) throws VciBaseException; /** * 鑾峰彇鏍戝舰鐨勫弬鐓� -- Gitblit v1.9.3