Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java

@@ -260,27 +260,41 @@

   /**
    * 接口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);