人员调整2.0

zss

2025-03-13 478825cfb0cd6758f4f4cdb274d66090b31f8bb8

人员调整2.0

 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();
    }

 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)

 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());

 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);
        }

 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 != ''">