From 478825cfb0cd6758f4f4cdb274d66090b31f8bb8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 13 三月 2025 17:18:40 +0800
Subject: [PATCH] 人员调整2.0
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java | 4 +++-
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java | 2 +-
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java | 2 +-
cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml | 6 +++---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonSupervisionRecordController.java | 12 +++++++-----
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
index 6fa8de7..b917ba1 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonCommunicationAbilityController.java
@@ -38,7 +38,7 @@
@ApiOperation(value = "鍒犻櫎 娌熼�氳褰�")
@DeleteMapping("deletePersonCommunicationAbility")
- public Result<?> deletePersonCommunicationAbility(@RequestParam("id") Integer id) {
+ public Result<?> deletePersonCommunicationAbility(Integer id) {
personCommunicationAbilityService.removeById(id);
return Result.success();
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
index 9192ced..17288f8 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPersonnelCapacityController.java
@@ -16,6 +16,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
+import java.util.Map;
/**
* <p>
@@ -59,7 +60,8 @@
@ApiOperation(value = "纭 浜哄憳鑳藉姏")
@PostMapping("confirmPersonnelCapability")
- public Result<?> confirmPersonnelCapability(@RequestParam("id") Integer id) {
+ public Result<?> confirmPersonnelCapability(@RequestBody Map<String,Object> map) {
+ Integer id =(Integer) map.get("id");
Integer userId = SecurityUtils.getUserId().intValue();
personPersonnelCapacityService.update(Wrappers.<PersonPersonnelCapacity>lambdaUpdate()
.eq(PersonPersonnelCapacity::getId, id)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
index b3c5614..4af5e0f 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonPostAuthorizationRecordController.java
@@ -39,7 +39,7 @@
@ApiOperation(value = "鍒犻櫎 浠昏亴鎺堟潈璁板綍")
@DeleteMapping("deletePersonPostAuthorizationRecord")
- public Result<?> deletePersonPostAuthorizationRecord(@RequestParam("id") Integer id) {
+ public Result<?> deletePersonPostAuthorizationRecord( Integer id) {
// 鍒犻櫎鏂囦欢
PersonPostAuthorizationRecord postAuthorizationRecord = personPostAuthorizationRecordService.getById(id);
FileSaveUtil.DeleteFile(postAuthorizationRecord.getSystemFileName());
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonSupervisionRecordController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonSupervisionRecordController.java
index 1905fb1..f42f5bd 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonSupervisionRecordController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonSupervisionRecordController.java
@@ -1,5 +1,6 @@
package com.ruoyi.personnel.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,6 +18,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.spring.web.json.Json;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
@@ -52,10 +54,10 @@
}
@ApiOperation(value = "鎵归噺鍒犻櫎 鐩戠潱璁板綍")
- @ApiImplicitParam(name = "ids", dataType = "array", allowMultiple = true, paramType = "query")
@DeleteMapping("deletePersonSupervisionRecord")
- public Result<?> deletePersonSupervisionRecord(@RequestParam("ids") List<Integer> ids) {
- personSupervisionRecordService.deletePersonSupervisionRecord(ids);
+ public Result<?> deletePersonSupervisionRecord(@RequestParam("ids") String ids) {
+ List<Integer> id = JSON.parseArray(ids, Integer.class);
+ personSupervisionRecordService.deletePersonSupervisionRecord(id);
return Result.success();
}
@@ -83,7 +85,7 @@
PersonSupervisionControlSheet byId = personSupervisionControlSheetService.getOne(Wrappers.<PersonSupervisionControlSheet>lambdaQuery()
.eq(PersonSupervisionControlSheet::getSupervisionRecordId, id));
if (ObjectUtils.isEmpty(byId)) {
- return Result.fail(202);
+ return Result.success();
} else {
return Result.success(byId);
}
@@ -95,7 +97,7 @@
PersonSupervisionProcessingSheet byId = personSupervisionProcessingSheetService.getOne(Wrappers.<PersonSupervisionProcessingSheet>lambdaQuery()
.eq(PersonSupervisionProcessingSheet::getSupervisionRecordId, id));
if (ObjectUtils.isEmpty(byId)) {
- return Result.fail(202);
+ return Result.success();
} else {
return Result.success(byId);
}
diff --git a/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
index 343b1b5..8aceaa8 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonPersonnelCapacityMapper.xml
@@ -65,10 +65,10 @@
where cptr.place_work like concat('%' ,'涓ぉ', '%')
GROUP BY cptr.user_id) p on u3.id = p.user_id
-- 鍙栦汉鍛樿兘鍔涚殑宀椾綅鑱岃矗
- left join (SELECT GROUP_CONCAT(e.label) responsibilities, cppc.id
+ left join (SELECT GROUP_CONCAT(e.dict_label) responsibilities, cppc.id
from cnas_person_personnel_capacity cppc
- left join enums e on FIND_IN_SET(e.value, cppc.job_responsibilities)
- where e.category = '宀椾綅鑱岃矗'
+ left join sys_dict_data e on FIND_IN_SET(e.dict_value, cppc.job_responsibilities)
+ where e.dict_type = 'responsibilities_list'
GROUP BY cppc.id) ecp on ecp.id = cppc.id
<where>
<if test="userId != null and userId != ''">
--
Gitblit v1.9.3