劳动合同上传功能

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentLaborContractInfoController.java

@@ -0,0 +1,72 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentLaborContractInfoService;
+import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("劳动合同")
+@RequestMapping(value = "/laborContractInfo")
+public class EnrollmentLaborContractInfoController {
+
+    @Resource
+    private EnrollmentLaborContractInfoService service;
+
+
+    /**
+     * 保存劳动合同
+     * @return
+     */
+    @ApiLog(value = "保存劳动合同", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentLaborContractInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除劳动合同
+     * @return
+     */
+    @ApiLog(value = "删除劳动合同", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentLaborContractInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 劳动合同列表
+     * @return
+     */
+    @ApiLog(value = "教育劳动合同", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentLaborContractInfo>> findList(EnrollmentLaborContractInfo info) throws Exception {
+        List<EnrollmentLaborContractInfo> list = service.findByUserId(info.getUserId(),"5");
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询劳动合同信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询劳动合同信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentLaborContractInfo> findById(EnrollmentLaborContractInfo info) throws Exception {
+        EnrollmentLaborContractInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentFamilyInfo.java

@@ -1,5 +1,7 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -23,6 +25,7 @@ public class EnrollmentFamilyInfo extends BaseEntity {
     private String name;
 
     //出生日期
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date birthDate;
 
     //与本人关系名称

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentLaborContractInfo.java

@@ -0,0 +1,55 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 培训经历
+ * @version 1.0
+ * @date
+ */
+@Data
+@TableName("human_resources_enrollment_contract_info")
+public class EnrollmentLaborContractInfo extends BaseEntity {
+
+    /** 合同类型 */
+    private String type;
+
+    /** 合同编号 */
+    private String code;
+
+    /** 期限 */
+    private String term;
+    /** 合同起始日期 */
+    private Date startDate;
+
+    /** 合同结束日期 */
+    private Date endDate;
+    /** 试用期结束日期 */
+    private Date trialEndDate;
+
+    /** 办理日期 */
+    private Date processeDate;
+
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> files;
+    /** 用户id */
+    private String userId;
+
+    /** 状态 */
+    private String status;
+
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentRegistration.java

@@ -151,6 +151,8 @@ public class EnrollmentRegistration extends BaseEntity {
     private List<EnrollmentFamilyInfo> familyInfoList; //家庭成员
     @TableField(exist = false)
     private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
+    @TableField(exist = false)
+    private List<EnrollmentLaborContractInfo> laborContractInfoList; //奖项信息
 
     @TableField(exist = false)
     private List<WorkAttachmentInfoDTO> idCardFront; //身份证正面

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentUserInfoAudit.java

@@ -64,4 +64,7 @@ public class EnrollmentUserInfoAudit extends BaseEntity {
     @TableField(exist = false)
     private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
 
+    @TableField(exist = false)
+    private List<EnrollmentLaborContractInfo> laborContractInfoList; //劳动合同
+
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/EnrollmentCertificateInfoMapper.java

@@ -24,4 +24,8 @@ public interface EnrollmentCertificateInfoMapper extends BaseMapper<EnrollmentCe
 
    void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
 
+
+    int updateCertById(EnrollmentCertificateInfo enrollmentCertificateInfo);
+
+
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/EnrollmentLaborContractInfoMapper.java

@@ -0,0 +1,31 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @version 1.0
+ * @date
+ */
+@Mapper
+@InterceptorIgnore(tenantLine = "true")
+public interface EnrollmentLaborContractInfoMapper extends BaseMapper<EnrollmentLaborContractInfo> {
+    EnrollmentLaborContractInfo getById(@Param("id") String id);
+
+    List<EnrollmentLaborContractInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    int  updateContractById( EnrollmentLaborContractInfo enrollmentLaborContractInfo);
+
+
+
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentCertificateInfoMapper.xml

@@ -38,7 +38,7 @@
         re.name as userName,
         so.name as departmentName
         from sys_cert a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>
@@ -48,6 +48,23 @@
         WHERE enrollment_registration_id = #{enrollmentRegistrationId}
     </delete>
 
+    <update id="updateCertById" parameterType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo">
+        UPDATE sys_cert
+        SET
+            type = #{type},
+            authorities = #{authorities},
+            no = #{no},
+            issued_date= #{issuedDate},
+            enroll_date= #{enrollDate},
+            expire_date= #{expireDate},
+            enroll_cert_no= #{enrollCertNo},
+            profession= #{profession},
+            status = #{status},
+            update_time = NOW()
+        WHERE id = #{id} and del_flag = '0'
+    </update>
+
+
     <select id="findDtos" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         SELECT
             id,

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentFamilyInfoMapper.xml

@@ -38,7 +38,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_family_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentLaborContractInfoMapper.xml

@@ -0,0 +1,81 @@
+<?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.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLaborContractInfoMapper">
+
+    <sql id="Base_Column_List">
+        a.id,
+        a.create_by_id,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
+        a.del_flag,
+        a.type,
+        a.code,
+        a.term,
+        a.start_date,
+        a.end_date,
+        a.trial_end_date,
+        a.processe_date,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_contract_info a
+        where a.del_flag = '0'
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_contract_info a
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <update id="updateContractById" parameterType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo">
+        UPDATE human_resources_enrollment_contract_info
+        SET
+            type = #{type},
+            code = #{code},
+            term = #{term},
+            start_date = #{startDate},
+            end_date = #{endDate},
+            trial_end_date = #{trialEndDate},
+            processe_date = #{processeDate},
+            status = #{status},
+            update_time = NOW()
+        WHERE id = #{id} and del_flag = '0'
+    </update>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_training_info
+        WHERE enrollment_registration_id = #{enrollmentRegistrationId}
+    </delete>
+
+    <select id="findDtos" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
+        SELECT
+            id,
+            url,
+            attachment_name AS `name`,
+            create_by_id AS `by`,
+            create_time,
+            attachment_flag AS attachmentFlag
+        FROM
+            work_attachment
+        WHERE
+            del_flag = 0
+          AND attachment_id = #{id}
+    </select>
+</mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentLanguageInfoMapper.xml

@@ -38,7 +38,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_language_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentRewardInfoMapper.xml

@@ -35,7 +35,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_reward_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentSkillInfoMapper.xml

@@ -36,7 +36,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_skill_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentTrainingInfoMapper.xml

@@ -35,7 +35,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_training_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentWorkInfoMapper.xml

@@ -38,7 +38,7 @@
         re.name as userName,
         so.name as departmentName
         from human_resources_enrollment_work_info a
-        left join human_resources_enrollment_registration re on a.user_id = re.user_id
+        left join human_resources_enrollment_registration re on a.user_id = re.user_id and re.del_flag = '0'
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentCertificateInfoService.java

@@ -139,7 +139,7 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
 
     public void update(EnrollmentCertificateInfo info){
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
-        mapper.updateById(info);
+        mapper.updateCertById(info);
         // 资质证书附件
         if (ObjectUtil.isNotEmpty(info.getCertificateAttachment())) {
             SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(info.getId());

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentLaborContractInfoService.java

@@ -0,0 +1,170 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.service;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.common.TokenProvider;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLaborContractInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLaborContractInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentTrainingInfoMapper;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.feign.IWorkAttachmentApi;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentLaborContractInfoService extends ServiceImpl<EnrollmentLaborContractInfoMapper, EnrollmentLaborContractInfo> {
+
+    @Resource
+    private EnrollmentLaborContractInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentLaborContractInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentLaborContractInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentLaborContractInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setFiles(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @return
+     */
+    public List<EnrollmentLaborContractInfo> findByUserId(String id,String status)  {
+        QueryWrapper<EnrollmentLaborContractInfo> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
+        if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
+            if("5".equals(status)){
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                );
+            }else{
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2").or().eq("status", "4")
+                );
+            }
+        }
+        List<EnrollmentLaborContractInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentLaborContractInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setFiles(files);
+            }
+        }
+        return infos;
+    }
+
+
+    public void saveOrUpdateInfo(EnrollmentLaborContractInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentLaborContractInfo info){
+        String id = UUID.randomUUID().toString().replace("-", "");
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        // 保存附件
+        if (ObjectUtil.isNotEmpty(info.getFiles())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            info.getFiles().stream().forEach(item->{
+                //保存附件信息
+                WorkAttachmentInfo workAttachmentDto = new WorkAttachmentInfo();
+                workAttachmentDto.setName(item.getName());
+                workAttachmentDto.setSize(item.getSize());
+                workAttachmentDto.setUrl(item.getUrl());
+                Map<String,String> map = new HashMap<>();
+                String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);
+                String userDTOInfo = JSON.toJSONString(userDTO);
+                String attachmentId =id;
+                String attachmentFlag = "laborContract";
+                String sortInfo = Integer.toString(sort.get());
+                map.put("workAttachmentDtoInfo",workAttachmentDtoInfo);
+                map.put("userDTOInfo",userDTOInfo);
+                map.put("attachmentId",attachmentId);
+                map.put("attachmentFlag",attachmentFlag);
+                map.put("sortInfo",sortInfo);
+                String fileId = SpringUtil.getBean ( IWorkAttachmentApi.class ).saveFile(map);
+                sort.getAndIncrement();
+            });
+        }
+        info.setId(id);
+        mapper.insert(info);
+    }
+
+    public void update(EnrollmentLaborContractInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateContractById(info);
+        // 保存附件
+        if (ObjectUtil.isNotEmpty(info.getFiles())) {
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(info.getId());
+            AtomicInteger sort = new AtomicInteger(1);
+            info.getFiles().stream().forEach(item->{
+                //保存附件信息
+                WorkAttachmentInfo workAttachmentDto = new WorkAttachmentInfo();
+                workAttachmentDto.setName(item.getName());
+                workAttachmentDto.setSize(item.getSize());
+                workAttachmentDto.setUrl(item.getUrl());
+                Map<String,String> map = new HashMap<>();
+                String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);
+                String userDTOInfo = JSON.toJSONString(userDTO);
+                String attachmentId = info.getId();
+                String attachmentFlag = "laborContract";
+                String sortInfo = Integer.toString(sort.get());
+                map.put("workAttachmentDtoInfo",workAttachmentDtoInfo);
+                map.put("userDTOInfo",userDTOInfo);
+                map.put("attachmentId",attachmentId);
+                map.put("attachmentFlag",attachmentFlag);
+                map.put("sortInfo",sortInfo);
+                String fileId = SpringUtil.getBean ( IWorkAttachmentApi.class ).saveFile(map);
+                sort.getAndIncrement();
+            });
+        }
+
+    }
+
+}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -92,6 +92,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     private EnrollmentRewardInfoService rewardInfoService;
 
     @Resource
+    private EnrollmentLaborContractInfoService laborContractInfoService;
+
+
+    @Resource
     private EnrollmentUserInfoAuditService userInfoAuditService;
 
     /**
@@ -705,6 +709,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //查询奖项信息
             List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId,"5");
             info.setRewardInfoList(rewardInfoList);
+
+            //查询劳动合同
+            List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId,"5");
+            info.setLaborContractInfoList(laborContractInfoList);
         }
 
         return info;
@@ -755,6 +763,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //查询奖项信息
             List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "2");
             info.setRewardInfoList(rewardInfoList);
+
+            //查询劳动合同
+            List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId,"5");
+            info.setLaborContractInfoList(laborContractInfoList);
         }
         return info;
     }
@@ -833,6 +845,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //查询奖项信息
             List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(id, "5");
             info.setRewardInfoList(rewardInfoList);
+
+            //查询劳动合同
+            List<EnrollmentLaborContractInfo> laborContractInfoList = laborContractInfoService.findByUserId(userId,"5");
+            info.setLaborContractInfoList(laborContractInfoList);
         }
 
         return info;