From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 e73f0da..49df39d 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
@@ -130,7 +130,7 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
- IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
+ IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
return R.data(pages);
}
@@ -254,33 +254,53 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
+ if(queryObject.getOrder().equals("asc")){
+ query.setAscs(queryObject.getSort());
+ }else{
+ query.setDescs(queryObject.getSort());
+ }
+
IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
return R.data(pages);
}
/**
* 鎺ュ彛param鍒楄〃
- * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridParam")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam")
- public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){
- IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query);
+ public R<IPage<DockingSysIntParamVO>>gridParam(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<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query);
return R.data(pages);
}
/**
* 鎺ュ彛param鍒楄〃
- * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+ * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
* @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
*/
@GetMapping("/gridHeader")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO")
- public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){
- IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query);
+ public R<IPage<DockingSysIntHeaderVO>>gridHeader(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<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(condtionMap,query);
return R.data(pages);
--
Gitblit v1.9.3