From 39c20925e7a063873e71f528ceda5414a8cd205e Mon Sep 17 00:00:00 2001 From: fengjin <1435304038@qq.com> Date: 星期五, 30 九月 2022 16:32:06 +0800 Subject: [PATCH] 1.添加部门应用模块 2.修改BuG --- flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java index 95430e0..7c379e1 100644 --- a/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java +++ b/flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java @@ -36,7 +36,6 @@ */ @ApiOperation("查询导办事务详情") @GetMapping("/getData") - @Authorization public ResultData selectConfigData(@RequestParam("Id") String Id,@CurrentUser SysUser sysUser) { Assert.notNull(Id, "Id 不能为空"); @@ -138,15 +137,23 @@ } + + /** - * 根据分离查询导办事务 + * 根据分类id查询导办事务(分页) * @param classifyId * @return */ - @ApiOperation(value = "根据分类查询导办事务",response = TransactionEvent.class) - @GetMapping("/queryByClassifyIdList") - public TableDataInfo queryByClassifyIdList(@RequestParam("classifyId") String classifyId,@RequestParam(required = false,name="departmentId") Integer departmentId){ - return getDataTable(iTransactionEventService.queryByClassifyIdList(classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId)); + @ApiOperation(value = "根据分类id查询导办事务(分页)",response = TransactionEvent.class) + @GetMapping("/queryByClassifyIdConfigList") + public TableDataInfo queryByClassifyIdConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum, + @RequestParam(value = "pageSize",required = false) Integer pageSize, + @RequestParam("classifyId") String classifyId, + @RequestParam(required = false,name="departmentId") Integer departmentId){ + Assert.notNull(pageNum, "pageNum 不能为空"); + Assert.notNull(pageSize, "pageSize 不能为空"); + Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize); + return getDataTable(iTransactionEventService.queryByClassifyIdList(pageParam,pageSize,classifyId,departmentId),iTransactionEventService.countNumByClassifyIdList(classifyId,departmentId)); } /** @@ -187,7 +194,6 @@ */ @ApiOperation(value = "智能咨询",response = RecommendResult.class) @GetMapping("/smartConsulting") - @Authorization public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){ return iTransactionEventService.smartConsulting(keyWord); -- Gitblit v1.7.1