liding
10 天以前 c9675b38b799d8b1a479928bcee73e53067788f9
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
@@ -6,12 +6,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.DepartmentDto;
import com.ruoyi.common.core.domain.entity.DepartmentLims;
import com.ruoyi.common.utils.FileSaveUtil;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.personnel.dto.PersonBasicInfoDetailsDto;
import com.ruoyi.personnel.dto.PersonBasicInfoDto;
import com.ruoyi.personnel.dto.UserPageDto;
import com.ruoyi.personnel.pojo.Annex;
import com.ruoyi.personnel.pojo.PersonBasicInfo;
import com.ruoyi.personnel.pojo.PersonBasicInfoFile;
import com.ruoyi.personnel.pojo.PersonBasicInfoWork;
import com.ruoyi.personnel.service.AnnexService;
@@ -74,8 +76,29 @@
    @ApiOperation(value = "人员明细分页查询")
    @GetMapping("basicInformationOfPersonnelSelectPage")
    public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
    public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page page, String name, Integer departmentId) {
        return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
    }
    @ApiOperation(value = "新增联系人")
    @PostMapping("/addContactPerson")
    public Result addContactPerson(@RequestBody PersonBasicInfo personBasicInfo) {
        personBasicInfoService.addContactPerson(personBasicInfo);
        return Result.success();
    }
    @ApiOperation(value = "更新联系人")
    @PostMapping("/updateContactPerson")
    public Result updateContactPerson(@RequestBody PersonBasicInfo personBasicInfo) {
        personBasicInfoService.updateContactPerson(personBasicInfo);
        return Result.success();
    }
    @ApiOperation(value = "删除联系人")
    @DeleteMapping("/deleteContactPerson")
    public Result deleteContactPerson(Integer id) {
        personBasicInfoService.removeById(id);
        return Result.success();
    }
    // 上传文件接口
@@ -83,7 +106,7 @@
    @PostMapping("/saveCNASFile")
    public Result saveFile(@RequestPart("file") MultipartFile file) {
        String s = FileSaveUtil.uploadWordFile(file);
        return Result.success("上传成功", s);
        return Result.success(s, "上传成功");
    }
    @GetMapping("/getAnnexByUserId")
@@ -176,7 +199,7 @@
     * @return
     */
    @ApiOperation(value = "人员培训基本信息附件删除")
    @GetMapping("/delBasicInfoFileList")
    @DeleteMapping("/delBasicInfoFileList")
    public Result delBasicInfoFileList(Integer basicInfoFileId){
        return Result.success(personBasicInfoFileService.removeById(basicInfoFileId));
    }
@@ -212,7 +235,7 @@
     * @return
     */
    @ApiOperation(value = "人员工作经历删除")
    @GetMapping("/delBasicInfoWorkList")
    @DeleteMapping("/delBasicInfoWorkList")
    public Result delBasicInfoWorkList(Integer basicInfoWorkId){
        return Result.success(personBasicInfoWorkService.removeById(basicInfoWorkId));
    }
@@ -226,4 +249,17 @@
    public Result updateBasicInfoWorkList(@RequestBody PersonBasicInfoWork basicInfoWork){
        return Result.success(personBasicInfoWorkService.updateById(basicInfoWork));
    }
    @ApiOperation(value = "添加组织架构")
    @PostMapping("/addDepartmentLims")
    public Result addDepartmentLims(@RequestBody DepartmentLims department) {
        return Result.success(personBasicInfoService.addDepartment(department));
    }
    @ApiOperation(value = "删除组织架构")
    @DeleteMapping("/delDepartmentLims")
    public Result delDepartmentLims(Integer id) {
        return Result.success(personBasicInfoService.delDepartment(id));
    }
}