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/service/impl/PersonBasicInfoServiceImpl.java | 10 +++++
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java | 22 +++++++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonBasicInfo.java | 3 +
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java | 4 ++
cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml | 22 +++--------
5 files changed, 45 insertions(+), 16 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 4060c65..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
@@ -13,6 +13,7 @@
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;
@@ -79,6 +80,27 @@
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();
+ }
+
// 涓婁紶鏂囦欢鎺ュ彛
@ApiOperation(value = "涓婁紶鏂囦欢鎺ュ彛")
@PostMapping("/saveCNASFile")
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonBasicInfo.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonBasicInfo.java
index abf3880..d6de5a8 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonBasicInfo.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/pojo/PersonBasicInfo.java
@@ -31,6 +31,9 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty("濮撳悕")
+ private String name;
+
@ApiModelProperty("褰撳墠鐘舵��")
private String currentState;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
index a55f8f6..0ca67bb 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java
@@ -32,6 +32,10 @@
IPage<Map<String, Object>> basicInformationOfPersonnelSelectPage(Page page, String name, Integer departmentId);
+ void addContactPerson(PersonBasicInfo personBasicInfo);
+
+ void updateContactPerson(PersonBasicInfo personBasicInfo);
+
void exportPersonBasicInfo(UserPageDto userPageDto, HttpServletResponse response) throws Exception;
String exportPersonBasicInfoById(Integer id, HttpServletResponse response);
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
index 877bee4..366ac4d 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java
@@ -161,6 +161,16 @@
}
@Override
+ public void addContactPerson(PersonBasicInfo personBasicInfo) {
+ baseMapper.insert(personBasicInfo);
+ }
+
+ @Override
+ public void updateContactPerson(PersonBasicInfo personBasicInfo) {
+ baseMapper.updateById(personBasicInfo);
+ }
+
+ @Override
public void exportPersonBasicInfo(UserPageDto userPageDto, HttpServletResponse response) throws Exception {
ArrayList<PersonBasicInfoDto> data = new ArrayList<>();
List<User> list = userMapper.selectList(null);
diff --git a/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
index da32169..46afb94 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml
@@ -19,28 +19,18 @@
<select id="selectPersonBasecInfoAndUser" resultType="java.util.Map">
select
- u.id userId,
- u.`name` name,
- u.account account,
- DATE_FORMAT(cpbi.group_time, '%Y-%m-%d') groupTime,
+ cpbi.id,
cpbi.native_place nativePlace,
- cpbi.identity_card identityCard,
cpbi.id_address idAddress,
- u.phone telephone,
- cpbi.graduated_institutions1 graduatedInstitutions1,
- cpbi.major1 major1,
- DATE_FORMAT(cpbi.graduation_time1, '%Y-%m-%d') graduationTime1,
- cpbi.official_academic_redentials officialAcademicRedentials,
- cpbi.highest_degree highestDegree,
- cpbi.professional_title professionalTitle
- from user u
- left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
+ cpbi.telephone,
+ cpbi.name
+ from cnas_person_basic_info cpbi
<where>
- FIND_IN_SET(#{departmentId},u.depart_lims_id)
<if test="name != null and name != ''">
- and u.name like concat('%',#{name},'%')
+ and cpbi.name like concat('%',#{name},'%')
</if>
</where>
+ order by cpbi.id desc
</select>
<!-- 瀵煎嚭鏌ヨ浜哄憳淇℃伅 -->
--
Gitblit v1.9.3