From e1f235008ea146a9ddd283682c762cec4dca94cb Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 13 九月 2023 15:28:07 +0800 Subject: [PATCH] 接口管理接口搜索支持模糊查询 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java index 646d483..4073285 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java @@ -7,12 +7,15 @@ import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.vo.pagemodel.*; import com.vci.ubcs.code.wrapper.*; +import com.vci.ubcs.starter.util.UBCSCondition; +import com.vci.ubcs.starter.util.UBCSSqlKeyword; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Map; @Service public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService { @@ -55,29 +58,30 @@ private IDockingDataService dockingDataService; /** * data鍒楄〃 - * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛� */ @Override - public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) { - IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask)); + public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) { + IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingTaskWrapper.build().pageVO(pages); } @Override - public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) { - IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData)); + public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) { + IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingDataWrapper.build().pageVO(pages); } /** * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛� - * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ @Override - public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) { - IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog)); + public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) { + //IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog)); + IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap)); return DockingLogeWrapper.build().pageVO(pages); } -- Gitblit v1.9.3