|
@@ -1,6 +1,7 @@
|
|
package com.persagy.fm.person.controller;
|
|
package com.persagy.fm.person.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
|
+import com.persagy.fm.common.utils.ResultHelper;
|
|
import com.persagy.fm.department.model.dto.DeleteDepartmentDTO;
|
|
import com.persagy.fm.department.model.dto.DeleteDepartmentDTO;
|
|
import com.persagy.fm.person.model.vo.SimplePersonListItemVO;
|
|
import com.persagy.fm.person.model.vo.SimplePersonListItemVO;
|
|
import com.persagy.fm.person.service.IPersonProjectService;
|
|
import com.persagy.fm.person.service.IPersonProjectService;
|
|
@@ -41,103 +42,103 @@ public class PersonController {
|
|
|
|
|
|
@ApiOperation(value = "创建人员")
|
|
@ApiOperation(value = "创建人员")
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
- public FmResponseItem<FmResponseUpsertVO> createPerson(
|
|
|
|
|
|
+ public CommonResult<FmResponseUpsertVO> createPerson(
|
|
@Valid @RequestBody AddPersonDTO addPersonDTO) {
|
|
@Valid @RequestBody AddPersonDTO addPersonDTO) {
|
|
Long id = personService.createPerson(addPersonDTO);
|
|
Long id = personService.createPerson(addPersonDTO);
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(id));
|
|
|
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(id));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "人员详情")
|
|
@ApiOperation(value = "人员详情")
|
|
@PostMapping("/get")
|
|
@PostMapping("/get")
|
|
- public FmResponseItem<ResponsePersonItemVO> queryPersonDetail(
|
|
|
|
|
|
+ public CommonResult<ResponsePersonItemVO> queryPersonDetail(
|
|
@Valid @RequestBody QueryPersonDetailDTO queryPersonDetailDTO) {
|
|
@Valid @RequestBody QueryPersonDetailDTO queryPersonDetailDTO) {
|
|
Person person = personService.queryPersonDetail(queryPersonDetailDTO.getId());
|
|
Person person = personService.queryPersonDetail(queryPersonDetailDTO.getId());
|
|
ResponsePersonItemVO responsePersonItemVO = ConvertPersonTool.INSTANCE.convert2ResponseItemDTO(person);
|
|
ResponsePersonItemVO responsePersonItemVO = ConvertPersonTool.INSTANCE.convert2ResponseItemDTO(person);
|
|
- return FmResponseUtil.successItem(responsePersonItemVO);
|
|
|
|
|
|
+ return ResultHelper.single(responsePersonItemVO);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "更新人员")
|
|
@ApiOperation(value = "更新人员")
|
|
@PostMapping("/update")
|
|
@PostMapping("/update")
|
|
- public FmResponseItem<FmResponseUpsertVO> updatePerson(
|
|
|
|
|
|
+ public CommonResult<FmResponseUpsertVO> updatePerson(
|
|
@Valid @RequestBody UpdatePersonDTO updatePersonDTO) {
|
|
@Valid @RequestBody UpdatePersonDTO updatePersonDTO) {
|
|
personService.updatePerson(updatePersonDTO);
|
|
personService.updatePerson(updatePersonDTO);
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(updatePersonDTO.getId()));
|
|
|
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(updatePersonDTO.getId()));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "删除人员")
|
|
@ApiOperation(value = "删除人员")
|
|
@PostMapping("/delete")
|
|
@PostMapping("/delete")
|
|
- public FmResponseMsg deletePerson(
|
|
|
|
|
|
+ public CommonResult deletePerson(
|
|
@RequestBody @Valid DeletePersonDTO deletePersonDTO) {
|
|
@RequestBody @Valid DeletePersonDTO deletePersonDTO) {
|
|
personService.deletePerson(deletePersonDTO.getId());
|
|
personService.deletePerson(deletePersonDTO.getId());
|
|
- return FmResponseUtil.successMsg("删除成功");
|
|
|
|
|
|
+ return ResultHelper.success("删除成功");
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "查找人名")
|
|
@ApiOperation(value = "查找人名")
|
|
@PostMapping("/name_quick_search")
|
|
@PostMapping("/name_quick_search")
|
|
- public FmResponseContent<List<SimplePersonListItemVO>> nameQuickSearch(
|
|
|
|
|
|
+ public CommonResult<PageList<SimplePersonListItemVO>> nameQuickSearch(
|
|
@Valid @RequestBody NameQuickSearchDTO nameQuickSearchDTO) {
|
|
@Valid @RequestBody NameQuickSearchDTO nameQuickSearchDTO) {
|
|
List<Person> personList = personService.nameQuickSearch(nameQuickSearchDTO);
|
|
List<Person> personList = personService.nameQuickSearch(nameQuickSearchDTO);
|
|
List<SimplePersonListItemVO> resultList = ConvertPersonTool.INSTANCE.convert2SimpleList(personList);
|
|
List<SimplePersonListItemVO> resultList = ConvertPersonTool.INSTANCE.convert2SimpleList(personList);
|
|
- return FmResponseUtil.successContent(resultList);
|
|
|
|
|
|
+ return ResultHelper.multi(resultList);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "人员列表, 分页查询")
|
|
@ApiOperation(value = "人员列表, 分页查询")
|
|
@PostMapping("/query")
|
|
@PostMapping("/query")
|
|
- public FmResponseContent<List<ResponsePersonListItemVO>> queryPerson(
|
|
|
|
|
|
+ public CommonResult<PageList<ResponsePersonListItemVO>> queryPerson(
|
|
@Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
|
|
@Valid @RequestBody PageQueryPersonDTO pageQueryPersonDTO) {
|
|
IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryPerson(pageQueryPersonDTO);
|
|
IPage<ResponsePersonListItemVO> pagedList = personService.pageQueryPerson(pageQueryPersonDTO);
|
|
- return FmResponseUtil.successContent(pagedList);
|
|
|
|
|
|
+ return ResultHelper.multi(pagedList);
|
|
}
|
|
}
|
|
|
|
|
|
// @ApiOperation(value = "重置密码")
|
|
// @ApiOperation(value = "重置密码")
|
|
// @PostMapping("/password/reset")
|
|
// @PostMapping("/password/reset")
|
|
-// public FmResponseMsg resetPassword(
|
|
|
|
|
|
+// public CommonResult resetPassword(
|
|
// @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
// @Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
// personService.resetPassWord(deletePersonDTO.getId());
|
|
// personService.resetPassWord(deletePersonDTO.getId());
|
|
-// return FmResponseUtil.successMsg("重置成功");
|
|
|
|
|
|
+// return ResultHelper.success("重置成功");
|
|
// }
|
|
// }
|
|
|
|
|
|
@ApiOperation(value = "禁用人员")
|
|
@ApiOperation(value = "禁用人员")
|
|
@PostMapping("/disable")
|
|
@PostMapping("/disable")
|
|
- public FmResponseItem<FmResponseUpsertVO> disablePerson(
|
|
|
|
|
|
+ public CommonResult<FmResponseUpsertVO> disablePerson(
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
personService.disablePerson(deletePersonDTO.getId());
|
|
personService.disablePerson(deletePersonDTO.getId());
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
|
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "离职人员")
|
|
@ApiOperation(value = "离职人员")
|
|
@PostMapping("/dismiss")
|
|
@PostMapping("/dismiss")
|
|
- public FmResponseItem<FmResponseUpsertVO> dismissPerson(
|
|
|
|
|
|
+ public CommonResult<FmResponseUpsertVO> dismissPerson(
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
personService.dismissPerson(deletePersonDTO.getId());
|
|
personService.dismissPerson(deletePersonDTO.getId());
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
|
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "人员恢复在职")
|
|
@ApiOperation(value = "人员恢复在职")
|
|
@PostMapping("/rejoin")
|
|
@PostMapping("/rejoin")
|
|
- public FmResponseItem<FmResponseUpsertVO> rejoinPerson(
|
|
|
|
|
|
+ public CommonResult<FmResponseUpsertVO> rejoinPerson(
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
personService.rejoinPerson(deletePersonDTO.getId());
|
|
personService.rejoinPerson(deletePersonDTO.getId());
|
|
- return FmResponseUtil.successItem(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
|
|
|
|
+ return ResultHelper.single(new FmResponseUpsertVO(deletePersonDTO.getId()));
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "批量更新")
|
|
@ApiOperation(value = "批量更新")
|
|
@PostMapping("/batch_update")
|
|
@PostMapping("/batch_update")
|
|
- public FmResponseMsg batchUpdatePeople(
|
|
|
|
|
|
+ public CommonResult batchUpdatePeople(
|
|
@Valid @RequestBody BatchUpdatePersonDTO batchUpdatePersonDTO) {
|
|
@Valid @RequestBody BatchUpdatePersonDTO batchUpdatePersonDTO) {
|
|
personService.batchUpdatePeople(batchUpdatePersonDTO);
|
|
personService.batchUpdatePeople(batchUpdatePersonDTO);
|
|
- return FmResponseUtil.successMsg("批量更新成功");
|
|
|
|
|
|
+ return ResultHelper.success("批量更新成功");
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "人员项目树")
|
|
@ApiOperation(value = "人员项目树")
|
|
@PostMapping("/projects/tree")
|
|
@PostMapping("/projects/tree")
|
|
- public FmResponseContent<List<ProjectTreeItemVO>> queryPersonProjectTree(
|
|
|
|
|
|
+ public CommonResult<PageList<ProjectTreeItemVO>> queryPersonProjectTree(
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
@Valid @RequestBody DeletePersonDTO deletePersonDTO) {
|
|
List<ProjectTreeItemVO> projectTreeItemVOList = personProjectService.queryPersonProjectTree(deletePersonDTO.getId());
|
|
List<ProjectTreeItemVO> projectTreeItemVOList = personProjectService.queryPersonProjectTree(deletePersonDTO.getId());
|
|
- return FmResponseUtil.successContent(projectTreeItemVOList);
|
|
|
|
|
|
+ return ResultHelper.multi(projectTreeItemVOList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|