|
@@ -2,6 +2,7 @@ package com.persagy.fm.department.controller;
|
|
|
|
|
|
import com.persagy.fm.common.constant.enums.BoolEnum;
|
|
|
import com.persagy.fm.common.response.*;
|
|
|
+import com.persagy.fm.common.utils.ResultHelper;
|
|
|
import com.persagy.fm.department.model.ConvertDepartmentTool;
|
|
|
import com.persagy.fm.department.model.Department;
|
|
|
import com.persagy.fm.department.model.dto.*;
|
|
@@ -50,10 +51,10 @@ public class DepartmentController {
|
|
|
|
|
|
@ApiOperation(value = "创建部门")
|
|
|
@PostMapping("/create")
|
|
|
- public FmResponseItem<FmResponseUpsertVO> createDepartment(
|
|
|
+ public CommonResult<FmResponseUpsertVO> createDepartment(
|
|
|
@Valid @RequestBody AddDepartmentDTO addDepartmentDTO) {
|
|
|
Long id = departmentService.createDepartment(addDepartmentDTO);
|
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(id));
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(id));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "部门详情")
|
|
@@ -67,7 +68,7 @@ public class DepartmentController {
|
|
|
// type = TransType.SERVICE, result = "name", batch = true,
|
|
|
// condition = "id", parameter = "projectIds", target = "projectsShowName")
|
|
|
// })
|
|
|
- public FmResponseItem<ResponseDepartmentItemVO> queryDepartmentDetail(
|
|
|
+ public CommonResult<ResponseDepartmentItemVO> queryDepartmentDetail(
|
|
|
@Valid @RequestBody QueryDepartmentDetailDTO queryDepartmentDetailDTO) {
|
|
|
Department department = departmentService.queryDepartmentDetail(queryDepartmentDetailDTO.getId());
|
|
|
ResponseDepartmentItemVO responseDepartmentItemVO = ConvertDepartmentTool.INSTANCE.convert2ResponseItemDTO(department);
|
|
@@ -75,7 +76,7 @@ public class DepartmentController {
|
|
|
String managers = department.getManagers();
|
|
|
List<Long> managerIdList = change2ManagerIdList(managers);
|
|
|
responseDepartmentItemVO.setManagers(managerIdList);
|
|
|
- return FmResponseUtil.successItem(responseDepartmentItemVO);
|
|
|
+ return ResultHelper.single(responseDepartmentItemVO);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -98,32 +99,32 @@ public class DepartmentController {
|
|
|
|
|
|
@ApiOperation(value = "更新部门")
|
|
|
@PostMapping("/update")
|
|
|
- public FmResponseItem<FmResponseUpsertVO> updateDepartment(
|
|
|
+ public CommonResult<FmResponseUpsertVO> updateDepartment(
|
|
|
@Valid @RequestBody UpdateDepartmentDTO updateDepartmentDTO) {
|
|
|
departmentService.updateDepartment(updateDepartmentDTO);
|
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(updateDepartmentDTO.getId()));
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(updateDepartmentDTO.getId()));
|
|
|
}
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "删除部门")
|
|
|
@PostMapping("/delete")
|
|
|
- public FmResponseMsg deleteDepartment(
|
|
|
+ public CommonResult deleteDepartment(
|
|
|
@RequestBody @Valid DeleteDepartmentDTO deleteDepartmentDTO) {
|
|
|
departmentService.deleteDepartment(deleteDepartmentDTO.getId());
|
|
|
- return FmResponseUtil.successMsg("删除成功");
|
|
|
+ return ResultHelper.success();
|
|
|
}
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "部门列表")
|
|
|
@PostMapping("/query")
|
|
|
- public FmResponseContent<List<ResponseDepartmentListItemVO>> queryDepartment(
|
|
|
+ public CommonResult<PageList<ResponseDepartmentListItemVO>> queryDepartment(
|
|
|
@Valid @RequestBody QueryDepartmentDTO queryDepartmentDTO) {
|
|
|
List<Department> departmentList = departmentService.queryDepartmentList(queryDepartmentDTO);
|
|
|
List<ResponseDepartmentListItemVO> resultList = ConvertDepartmentTool.INSTANCE.convert2List(departmentList);
|
|
|
|
|
|
/* 处理返回结果中是否包含子部门的业务 */
|
|
|
if (CollectionUtils.isEmpty(departmentList)) {
|
|
|
- return FmResponseUtil.successContent(resultList);
|
|
|
+ return ResultHelper.multi(resultList);
|
|
|
}
|
|
|
// 获取部门的子部门
|
|
|
List<Long> deptIds = departmentList.stream().
|
|
@@ -139,7 +140,7 @@ public class DepartmentController {
|
|
|
item.setHasChildren(BoolEnum.FALSE.getType());
|
|
|
}
|
|
|
});
|
|
|
- return FmResponseUtil.successContent(resultList);
|
|
|
+ return ResultHelper.multi(resultList);
|
|
|
}
|
|
|
|
|
|
//@ApiOperation(value = "部门列表, 分页查询")
|
|
@@ -159,18 +160,18 @@ public class DepartmentController {
|
|
|
|
|
|
@ApiOperation(value = "部门树")
|
|
|
@PostMapping("/tree")
|
|
|
- public FmResponseContent<List<ResponseDepartmentTreeItemVO>> queryDepartmentTree(
|
|
|
+ public CommonResult<PageList<ResponseDepartmentTreeItemVO>> queryDepartmentTree(
|
|
|
@Valid @RequestBody QueryDepartmentTreeDTO queryDepartmentTreeDTO) {
|
|
|
List<ResponseDepartmentTreeItemVO> responseDepTreeItems = depTreeService.queryDepartmentTree(queryDepartmentTreeDTO);
|
|
|
- return FmResponseUtil.successContent(responseDepTreeItems);
|
|
|
+ return ResultHelper.multi(responseDepTreeItems);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "部门项目树")
|
|
|
@PostMapping("/projects/tree")
|
|
|
- public FmResponseContent<List<ProjectTreeItemVO>> queryDepProjectTree(
|
|
|
+ public CommonResult<PageList<ProjectTreeItemVO>> queryDepProjectTree(
|
|
|
@Valid @RequestBody DeleteDepartmentDTO deleteDepartmentDTO) {
|
|
|
List<ProjectTreeItemVO> projectTreeItemVOList = depProjectService.queryDepProjectTree(deleteDepartmentDTO.getId());
|
|
|
- return FmResponseUtil.successContent(projectTreeItemVOList);
|
|
|
+ return ResultHelper.multi(projectTreeItemVOList);
|
|
|
}
|
|
|
|
|
|
}
|