From dc5e9ce4e0fb964f037ef8c18b926745e5aedc97 Mon Sep 17 00:00:00 2001 From: “djh” <“3298565835@qq.com”> Date: 星期三, 16 七月 2025 14:10:13 +0800 Subject: [PATCH] 修改 --- multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java index b8dabc1..a7a66fd 100644 --- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java +++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysDeptController.java @@ -7,6 +7,8 @@ import com.gkhy.exam.common.domain.TreeSelect; import com.gkhy.exam.common.domain.entity.SysDept; import com.gkhy.exam.system.domain.SysFunctionalDistribution; +import com.gkhy.exam.system.domain.SysFunctionalRemark; +import com.gkhy.exam.system.domain.req.SysDeptPageReq; import com.gkhy.exam.system.domain.vo.DeptVo; import com.gkhy.exam.system.domain.vo.FunctionalDistributionVo; import com.gkhy.exam.system.domain.vo.SysDeptResponsibilityReqVo; @@ -54,12 +56,33 @@ return CommonResult.success(depts); } + @GetMapping("/getOutDeptList") + @ApiOperation(value = "获取部门列表简化版本") + public CommonResult getOutDeptList(SysDept dept) + { + List<SysDept> outDeptList = deptService.getOutDeptList(dept); + return CommonResult.success(outDeptList); + } + + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "pageNum", dataType = "int", required = false, value = "当前页,默认1"), + @ApiImplicitParam(paramType = "query", name = "pageSize", dataType = "int", required = false, value = "每页数目,默认10"), + }) + @ApiOperation(value = "获取部门列表分页") + public CommonResult pageList(SysDeptPageReq dept) + { + return CommonResult.success(deptService.selectDeptPageList(dept)); + } + + @GetMapping("/treeList") @ApiOperation(value = "获取部门列表树状") public CommonResult treeList(SysDept dept) { - List<SysDept> treeSelects = deptService.selectDeptTreeList(dept); + List<TreeSelect> treeSelects = deptService.selectDeptTreeList(dept); return CommonResult.success(treeSelects); } @@ -124,6 +147,18 @@ return CommonResult.success(functionalDistributionList); } + @GetMapping("/functionalRemarkList") + @ApiOperation(value = "职能分配备注数据") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "Long", required = true, value = "公司id"), + }) + public CommonResult functionalRemarkList(@RequestParam Long companyId) + { + List<SysFunctionalRemark> functionalRemarkList = deptService.getFunctionalRemarkList(companyId); + + return CommonResult.success(functionalRemarkList); + } + @PostMapping("/saveFunctionalDistribution") @ApiOperation(value = "保存职能分配") @@ -137,7 +172,7 @@ @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", name = "companyId", dataType = "Long", required = true, value = "公司id"), }) - public CommonResult initFunctionalDistribution(@RequestParam Long companyId) { + public CommonResult initFunctionalDistribution(@RequestParam("companyId") Long companyId) { return CommonResult.success(deptService.initFunctionalDistribution(companyId)); } -- Gitblit v1.9.2