人员修改

zss

2024-12-23 0d930cdcf56bb92e67afabf45ec860689baf0282

人员修改

 cnas-personnel/src/main/java/com/yuanchu/mom/controller/PersonBasicInfoController.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.CustomClazzName;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DepartmentDto;
import com.yuanchu.mom.dto.PersonBasicInfoDetailsDto;
@@ -27,7 +28,7 @@

/**
 * <p>
 *  前端控制器
 * 前端控制器
 * </p>
 *
 * @author 江苏鵷雏网络科技有限公司
@@ -36,7 +37,7 @@
@Api(tags = "人员-人员基本信息")
@RestController
@RequestMapping("/personBasicInfo")
@CustomClazzName(name = "资源要求",index = 8)
//@CustomClazzName(name = "资源要求", index = 8)
public class PersonBasicInfoController {

    @Resource
@@ -45,14 +46,14 @@
    @Resource
    private AnnexService annexService;

    @ValueClassify("人员基本信息")
    @ValueAuth
    @ApiOperation(value = "查询CNAS人员侧边栏")
    @GetMapping("/selectCNSAPersonTree")
    public Result<List<DepartmentDto>> selectCNSAPersonTree() {
        return Result.success(personBasicInfoService.selectCNSAPersonTree());
    }

    @ValueClassify("人员基本信息")
    @ValueAuth
    @ApiOperation(value = "获取CNAS人员基本信息")
    @GetMapping("/getCNASPersonnelInfo")
    public Result getCNASPersonnelInfo(Integer userId) {
@@ -67,8 +68,8 @@
        return Result.success();
    }

    @ApiOperation(value = "人员明细分页查询")
    @ValueClassify("人员基本信息")
    @ApiOperation(value = "人员明细分页查询")
    @GetMapping("basicInformationOfPersonnelSelectPage")
    public Result<IPage<Map<String, Object>>> basicInformationOfPersonnelSelectPage(Page<List<PersonBasicInfoDetailsDto>> page, String name, Integer departmentId) {
        return Result.success(personBasicInfoService.basicInformationOfPersonnelSelectPage(page, name, departmentId));
@@ -77,11 +78,13 @@
    // 上传文件接口
    @ApiOperation(value = "上传文件接口")
    @PostMapping("/saveCNASFile")
    @ValueAuth
    public Result saveFile(@RequestPart("file") MultipartFile file) {
        String s = FileSaveUtil.StoreFile(file);
        return Result.success("上传成功", s);
    }

    @ValueAuth
    @GetMapping("/getAnnexByUserId")
    public Result<List<Annex>> getAnnexByUserId(Integer userId) {
        List<Annex> list = annexService.list(new LambdaQueryWrapper<Annex>().eq(Annex::getUserId, userId));
@@ -89,6 +92,7 @@
    }

    // 删除文件
    @ValueAuth
    @DeleteMapping("/deleteCNASFile")
    public Result saveFile(String fileName) {
        String[] split = fileName.split(",");
@@ -102,19 +106,23 @@
    /**
     * 人员基本信息附件新增
     */
    @ValueAuth
    @PostMapping("/addAnnex")
    public Result addAnnex(@RequestBody Annex annex) {
        annexService.save(annex);
        return Result.success();
    }

    @ValueAuth
    @GetMapping("/getAnnex")
    public Result<Annex> getAnnex(Integer id) {
        return Result.success(annexService.getById(id));
    }

    /**
     * 人员基本信息附件删除
     */
    @ValueAuth
    @DeleteMapping("/deleteAnnex/{id}")
    public Result deleteAnnex(@PathVariable("id") Integer id) {
        annexService.removeById(id);
@@ -123,8 +131,8 @@

    /**
     * 人员基本信息附件修改
     *
     */
    @ValueAuth
    @PostMapping("/updateAnnex")
    public Result updateAnnex(@RequestBody Annex annex) {
        annexService.updateById(annex);
@@ -133,14 +141,16 @@

    @ApiOperation(value = "导出人员基本信息")
    @PostMapping("/exportPersonBasicInfo")
    @ValueClassify("人员基本信息")
    public void exportPersonBasicInfo(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
        UserPageDto userPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
        personBasicInfoService.exportPersonBasicInfo(userPageDto,response);
        personBasicInfoService.exportPersonBasicInfo(userPageDto, response);
    }

    @ApiOperation(value = "下载人员档案卡")
    @PostMapping("/exportPersonBasicInfoById")
    @ValueClassify("人员基本信息")
    public Result exportPersonBasicInfoById(Integer id, HttpServletResponse response) {
        return Result.success(personBasicInfoService.exportPersonBasicInfoById(id,response));
        return Result.success(personBasicInfoService.exportPersonBasicInfoById(id, response));
    }
}

 cnas-personnel/src/main/resources/mapper/PersonBasicInfoMapper.xml

@@ -1,36 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.PersonBasicInfoMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.PersonBasicInfo">
        <id column="id" property="id" />
        <result column="current_state" property="currentState" />
        <result column="entry_time" property="entryTime" />
        <result column="post" property="post" />
        <result column="professional_title" property="professionalTitle" />
        <result column="sex" property="sex" />
        <result column="personnel_classification" property="personnelClassification" />
        <result column="date_birth" property="dateBirth" />
        <result column="identity_card" property="identityCard" />
        <result column="nation" property="nation" />
        <result column="political_status" property="politicalStatus" />
        <result column="official_academic_redentials" property="officialAcademicRedentials" />
        <result column="graduation_time1" property="graduationTime1" />
        <result column="graduated_institutions1" property="graduatedInstitutions1" />
        <result column="major1" property="major1" />
        <result column="graduation_time2" property="graduationTime2" />
        <result column="graduated_institutions2" property="graduatedInstitutions2" />
        <result column="major2" property="major2" />
        <result column="telephone" property="telephone" />
        <result column="end_planned_internship" property="endPlannedInternship" />
        <result column="end_practical_practice" property="endPracticalPractice" />
        <result column="date_departure" property="dateDeparture" />
        <result column="desktop_picture" property="desktopPicture" />
        <result column="attachment_information" property="attachmentInformation" />
        <result column="remarks" property="remarks" />
        <result column="user_id" property="userId" />
        <result column="current_position" property="currentPosition" />
        <id column="id" property="id"/>
        <result column="current_state" property="currentState"/>
        <result column="entry_time" property="entryTime"/>
        <result column="post" property="post"/>
        <result column="professional_title" property="professionalTitle"/>
        <result column="sex" property="sex"/>
        <result column="personnel_classification" property="personnelClassification"/>
        <result column="date_birth" property="dateBirth"/>
        <result column="identity_card" property="identityCard"/>
        <result column="nation" property="nation"/>
        <result column="political_status" property="politicalStatus"/>
        <result column="official_academic_redentials" property="officialAcademicRedentials"/>
        <result column="graduation_time1" property="graduationTime1"/>
        <result column="graduated_institutions1" property="graduatedInstitutions1"/>
        <result column="major1" property="major1"/>
        <result column="graduation_time2" property="graduationTime2"/>
        <result column="graduated_institutions2" property="graduatedInstitutions2"/>
        <result column="major2" property="major2"/>
        <result column="telephone" property="telephone"/>
        <result column="end_planned_internship" property="endPlannedInternship"/>
        <result column="end_practical_practice" property="endPracticalPractice"/>
        <result column="date_departure" property="dateDeparture"/>
        <result column="desktop_picture" property="desktopPicture"/>
        <result column="attachment_information" property="attachmentInformation"/>
        <result column="remarks" property="remarks"/>
        <result column="user_id" property="userId"/>
        <result column="current_position" property="currentPosition"/>
    </resultMap>

    <select id="selectLimsUser" resultType="com.yuanchu.mom.dto.DepartmentDto">
@@ -49,48 +48,49 @@
    </select>

    <select id="basicInformationOfPersonnelSelectPage" resultType="java.util.Map">
        select
            u.id,
            u.name,
            u.account,
            cpbi.sex,
            cpbi.date_birth,
            u.age,
            cpbi.entry_time,
            cpbi.personnel_classification,
            cpbi.official_academic_redentials,
            cpbi.current_position,
            u.phone,
            cpbi.date_departure,
            cpbi.current_state,
            u1.name createUser
        select u.id,
               u.name,
               u.account,
               cpbi.sex,
               cpbi.date_birth,
               u.age,
               cpbi.entry_time,
               cpbi.personnel_classification,
               cpbi.official_academic_redentials,
               cpbi.current_position,
               u.phone,
               cpbi.date_departure,
               cpbi.current_state,
               u1.name createUser
        from user u
                 left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
                 left join user u1 on u1.id = u.create_user
        where FIND_IN_SET(#{departmentId},u.depart_lims_id)
        where FIND_IN_SET(#{departmentId}, u.depart_lims_id)
    </select>
    <select id="selectPersonBasecInfoAndUser" resultType="java.util.Map">
        select
            u.id  userId,
            u.`name`  name,
            u.account account,
            DATE_FORMAT(cpbi.entry_time, '%Y-%m-%d') groupTime,
            DATE_FORMAT(cpbi.end_practical_practice, '%Y-%m-%d')  endPracticalPracticeStr,
            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,
            cpbi.emergency_contact emergencyContact,
            cpbi.emergency_contact_phone emergencyContactPhone
        u.id userId,
        u.`name` name,
        u.account account,
        DATE_FORMAT(cpbi.group_time, '%Y-%m-%d') groupTime,
        DATE_FORMAT(cpbi.end_practical_practice, '%Y-%m-%d') endPracticalPracticeStr,
        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,
        cpbi.emergency_contact emergencyContact,
        cpbi.emergency_contact_phone emergencyContactPhone,
        group_concat( DISTINCT technical_post SEPARATOR ',') technicalPost
        from user u
                 left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
                 left join user u1 on u1.id = u.create_user
        left join cnas_person_basic_info cpbi on cpbi.user_id = u.id
        left join cnas_person_personnel_capacity cppc on u.id = cppc.user_id
        left join user u1 on u1.id = u.create_user
        <where>
            FIND_IN_SET(#{departmentId},u.depart_lims_id)
            <if test="name != null and name != ''">

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -45,6 +45,17 @@
    @Autowired
    private DataConfigService dataConfigService;

    /**
     * 获取人员信息
     * @return
     * @throws Exception
     */
    @ValueAuth
    @GetMapping("/selectUserList")
    public Result selectUserList() {
        return  Result.success(deviceService.selectUserList());
    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")

 cnas-server/src/main/java/com/yuanchu/mom/dto/DepartmentDto.java

@@ -18,5 +18,7 @@

    private Integer fatherId;

    private Integer userId;

    private List<DepartmentDto> children;
}

 cnas-server/src/main/java/com/yuanchu/mom/service/DeviceService.java

@@ -5,6 +5,7 @@
import com.yuanchu.mom.dto.ADto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.vo.Result;

import javax.servlet.http.HttpServletRequest;
@@ -16,6 +17,8 @@
 */
public interface DeviceService extends IService<Device> {

    List<User> selectUserList();

    Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter);

    int addDeviceParameter(Device itemParameter);

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -55,6 +56,12 @@
    private DataConfigService dataConfigService;

    @Override
    public List<User> selectUserList() {
        List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().like(User::getDepartLimsId, "1"));
        return users;
    }

    @Override
    public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter) {
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(DeviceDto.class));

 pom.xml

@@ -22,6 +22,10 @@
        <module>cnas-server</module>
        <module>inspect-server</module>
        <module>performance-server</module>
        <module>cnas-manage</module>
        <module>cnas-personnel</module>
        <module>cnas-process</module>
        <module>cnas-resource-require</module>
    </modules>

    <properties>