feat:联系人管理，基本信息修改

liding

10 天以前 c9675b38b799d8b1a479928bcee73e53067788f9

feat:联系人管理，基本信息修改

 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")

 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;


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

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

 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>

    <!-- 导出查询人员信息 -->