From aee08c8092d2bbabdcc4485acf12a5cef2877242 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期六, 08 十月 2022 14:12:26 +0800 Subject: [PATCH] 新增组织机构部门下属查询接口 --- flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java index c01ab73..a5b5346 100644 --- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java +++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java @@ -1,14 +1,24 @@ package com.dg.core.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dg.core.ResultData; +import com.dg.core.annotation.Authorization; +import com.dg.core.annotation.CurrentUser; +import com.dg.core.db.gen.entity.ClassifyAdministration; import com.dg.core.db.gen.entity.OrganizationChartEntity; +import com.dg.core.db.gen.entity.SysUser; import com.dg.core.service.IOrganizationChartService; import com.dg.core.util.TableDataInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.List; @Api(tags = {"组织架构接口"}) @@ -23,7 +33,7 @@ /** * 查询机构列表 */ - @ApiOperation("查询机构列表") + @ApiOperation(value = "查询机构列表",response = OrganizationChartEntity.class) @GetMapping("/getList") public TableDataInfo selectConfigList() { @@ -33,8 +43,9 @@ /** * 新增机构 */ - @ApiOperation("新增机构") + @ApiOperation(value = "新增机构",response = OrganizationChartEntity.class) @PostMapping("/add") + @Authorization public ResultData insertConfig(@RequestBody OrganizationChartEntity entity) { Assert.notNull(entity.getGrade(), "等级 grade 不能为空"); @@ -59,10 +70,13 @@ /** * 更新机构 */ - @ApiOperation("更新机构") + @ApiOperation(value = "更新机构",response = OrganizationChartEntity.class) @PostMapping("/update") - public ResultData updateConfig(@RequestBody OrganizationChartEntity entity) + @Authorization + public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser) { + entity.setUpdateTime(LocalDateTime.now()); + entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId()))); return toAjax(iOrganizationChartService.updateConfig(entity)); } @@ -71,6 +85,7 @@ */ @ApiOperation("删除机构") @DeleteMapping("/delete") + @Authorization public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id) { Assert.notNull(Id, "Id 不能为空"); @@ -95,4 +110,21 @@ return ResultData.success(iOrganizationChartService.selectConfigById(id)); } + + /** + * 查询机构列表(分页) + */ + @ApiOperation(value = "查询机构列表(分页)(部门应用)",response = OrganizationChartEntity.class) + @GetMapping("/queryList") + @Authorization + public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum, + @RequestParam(value = "pageSize",required = false) Integer pageSize, + @RequestParam(value = "organizationName",required = false)String organizationName){ + Assert.notNull(pageNum, "pageNum can not be empty"); + Assert.notNull(pageSize, "pageSize can not be empty"); + Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize); + return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName)); + } + + } -- Gitblit v1.7.1