From 4ed0e9d8ed0e785e62c0f9deb299445e5947c364 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 15:43:42 +0800
Subject: [PATCH] PDM 集团码提示信息bug修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 22eb94d..e73f0da 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -58,16 +58,20 @@
 	private final 	ICodeDuckingSyncService codeDuckingSyncService;
 
 	/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
-	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 *@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingSystem")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
-	public R<IPage<DockingSystemVO>> page(Map<String,String> condtionMap,Query query) {
-		if(!CollectionUtils.isEmpty(condtionMap)){}{
+	public R<IPage<DockingSystemVO>> page(BaseQueryObject queryObject) {
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
 			condtionMap=new HashMap<>();
 		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
 		IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return R.data(DockingSystemWrapper.build().pageVO(pages));
 	}
@@ -112,16 +116,20 @@
 	}
 	/**
 	 * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
-	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridSystemConfig")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "dockingSystemConfig")
-	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(Map<String,String> condtionMap, Query query){
-		if(!CollectionUtils.isEmpty(condtionMap)){
+	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
 			condtionMap=new HashMap<>();
 		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
 		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
 		return R.data(pages);
 	}
@@ -191,16 +199,20 @@
 
 	/**
 	 * 寰呴泦鎴愭暟鎹�
-	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridDockingData")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
-	public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){
-		if(!CollectionUtils.isEmpty(condtionMap)){
+	public R<IPage<DockingDataVO>> gridDockingData(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
 			condtionMap=new HashMap<>();
 		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
 		IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
 		return R.data(pages);
 	}
@@ -208,32 +220,40 @@
 
 	/**
 	 * data鍒楄〃
-	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingTask")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
-	public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){
-		if(!CollectionUtils.isEmpty(condtionMap)){
+	public R<IPage<DockingTaskVO>> gridDockingTask(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
 			condtionMap=new HashMap<>();
 		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
 		IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
 		return R.data(pages);
 	}
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridLoge")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
-	public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){
-		if(!CollectionUtils.isEmpty(condtionMap)){
+	public R<IPage<DockingLogeVO>> gridLoge(BaseQueryObject queryObject){
+		Map<String,String> condtionMap=queryObject.getConditionMap();
+		Query query=new Query();
+		if(CollectionUtils.isEmpty(condtionMap)){
 			condtionMap=new HashMap<>();
 		}
+		query.setCurrent(queryObject.getPage());
+		query.setSize(queryObject.getLimit());
 		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
 		return R.data(pages);
 	}

--
Gitblit v1.9.3