From c9675b38b799d8b1a479928bcee73e53067788f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 10:28:06 +0800
Subject: [PATCH] feat:联系人管理，基本信息修改
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
index 01b44d4..5298017 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java
+++ b/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));
+ }
}
--
Gitblit v1.9.3