入职信息调整

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

@@ -0,0 +1,73 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentCertificateInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("资质证书")
+@RequestMapping(value = "/certificateInfo")
+public class EnrollmentCertificateInfoController {
+
+    @Resource
+    private EnrollmentCertificateInfoService service;
+
+
+    /**
+     * 保存资质证书
+     * @return
+     */
+    @ApiLog(value = "保存资质证书", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentCertificateInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除资质证书
+     * @return
+     */
+    @ApiLog(value = "删除资质证书", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentCertificateInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 资质证书
+     * @return
+     */
+    @ApiLog(value = "资质证书", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentCertificateInfo>> findList(EnrollmentCertificateInfo info) throws Exception {
+        List<EnrollmentCertificateInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询资质证书
+     * @return
+     */
+    @ApiLog(value = "根据id查询资质证书信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentCertificateInfo> findById(EnrollmentCertificateInfo info) throws Exception {
+        EnrollmentCertificateInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.jeeplus.common.excel.EasyExcelUtils;
+import com.jeeplus.common.excel.ExcelOptions;
+import com.jeeplus.common.excel.annotation.ExportMode;
+import com.jeeplus.common.utils.ResponseUtil;
+import com.jeeplus.human.depart.handover.domain.Handover;
+import com.jeeplus.human.depart.handover.service.HandoverService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.*;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.*;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.ExportDTO;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.UserTemplate;
+import com.jeeplus.human.enrollment.enrollmentRegistration.utils.DingTalkSyncUtil;
+import com.jeeplus.human.enrollment.enrollmentRegistration.utils.EasyPoiUtil;
+import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.logging.constant.enums.LogTypeEnum;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("教育经历")
+@RequestMapping(value = "/eduInfo")
+public class EnrollmentEduInfoController {
+
+    @Resource
+    private EnrollmentEduInfoService eduInfoService;
+
+
+    /**
+     * 保存教育经历
+     * @return
+     */
+    @ApiLog(value = "保存教育经历", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentEduInfo eduInfo) throws Exception {
+        eduInfoService.saveOrUpdateEduInfo(eduInfo);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除教育经历
+     * @return
+     */
+    @ApiLog(value = "删除教育经历", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentEduInfo eduInfo) throws Exception {
+        eduInfoService.removeById(eduInfo.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 教育经历列表
+     * @return
+     */
+    @ApiLog(value = "教育经历列表", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentEduInfo>> findList(EnrollmentEduInfo eduInfo) throws Exception {
+        List<EnrollmentEduInfo> list = eduInfoService.findByRegistrationId(eduInfo.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询教育经历信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询教育经历信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentEduInfo> findById(EnrollmentEduInfo eduInfo) throws Exception {
+        EnrollmentEduInfo res = eduInfoService.findById(eduInfo.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentFamilyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentFamilyInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("家庭成员")
+@RequestMapping(value = "/familyInfo")
+public class EnrollmentFamilyInfoController {
+
+    @Resource
+    private EnrollmentFamilyInfoService service;
+
+
+    /**
+     * 保存家庭成员
+     * @return
+     */
+    @ApiLog(value = "保存家庭成员", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentFamilyInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除家庭成员
+     * @return
+     */
+    @ApiLog(value = "删除家庭成员", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentFamilyInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 语言能力
+     * @return
+     */
+    @ApiLog(value = "家庭成员", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentFamilyInfo>> findList(EnrollmentFamilyInfo info) throws Exception {
+        List<EnrollmentFamilyInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询语言能力
+     * @return
+     */
+    @ApiLog(value = "根据id查询语言能力信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentFamilyInfo> findById(EnrollmentFamilyInfo info) throws Exception {
+        EnrollmentFamilyInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentLanguageInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("语言能力")
+@RequestMapping(value = "/languageInfo")
+public class EnrollmentLanguageInfoController {
+
+    @Resource
+    private EnrollmentLanguageInfoService service;
+
+
+    /**
+     * 保存语言能力
+     * @return
+     */
+    @ApiLog(value = "保存语言能力", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentLanguageInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除语言能力
+     * @return
+     */
+    @ApiLog(value = "删除语言能力", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentLanguageInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 语言能力
+     * @return
+     */
+    @ApiLog(value = "语言能力", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentLanguageInfo>> findList(EnrollmentLanguageInfo info) throws Exception {
+        List<EnrollmentLanguageInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询语言能力
+     * @return
+     */
+    @ApiLog(value = "根据id查询语言能力信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentLanguageInfo> findById(EnrollmentLanguageInfo info) throws Exception {
+        EnrollmentLanguageInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -669,4 +669,5 @@ public class EnrollmentRegistrationController {
         dingTalkSyncUtil.getUserByMobileSyncData();
     }
 
+
 }

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

@@ -0,0 +1,75 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentLanguageInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentRewardInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("奖项信息")
+@RequestMapping(value = "/rewardInfo")
+public class EnrollmentRewardInfoController {
+
+    @Resource
+    private EnrollmentRewardInfoService service;
+
+
+    /**
+     * 保存奖项信息
+     * @return
+     */
+    @ApiLog(value = "保存奖项信息", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentRewardInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除奖项信息
+     * @return
+     */
+    @ApiLog(value = "删除奖项信息", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentRewardInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 奖项信息
+     * @return
+     */
+    @ApiLog(value = "奖项信息", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentRewardInfo>> findList(EnrollmentRewardInfo info) throws Exception {
+        List<EnrollmentRewardInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询奖项信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询奖项信息信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentRewardInfo> findById(EnrollmentRewardInfo info) throws Exception {
+        EnrollmentRewardInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentCertificateInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentSkillInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("专业技能")
+@RequestMapping(value = "/skillInfo")
+public class EnrollmentSkillInfoController {
+
+    @Resource
+    private EnrollmentSkillInfoService service;
+
+
+    /**
+     * 保存专业技能
+     * @return
+     */
+    @ApiLog(value = "保存专业技能", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentSkillInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除专业技能
+     * @return
+     */
+    @ApiLog(value = "删除专业技能", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentSkillInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 专业技能
+     * @return
+     */
+    @ApiLog(value = "专业技能", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentSkillInfo>> findList(EnrollmentSkillInfo info) throws Exception {
+        List<EnrollmentSkillInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询专业技能
+     * @return
+     */
+    @ApiLog(value = "根据id查询专业技能信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentSkillInfo> findById(EnrollmentSkillInfo info) throws Exception {
+        EnrollmentSkillInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentEduInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentTrainingInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("培训经历")
+@RequestMapping(value = "/trainingInfo")
+public class EnrollmentTrainingInfoController {
+
+    @Resource
+    private EnrollmentTrainingInfoService service;
+
+
+    /**
+     * 保存培训经历
+     * @return
+     */
+    @ApiLog(value = "保存培训经历", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentTrainingInfo info) throws Exception {
+        service.saveOrUpdateInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除培训经历
+     * @return
+     */
+    @ApiLog(value = "删除培训经历", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentTrainingInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 培训经历列表
+     * @return
+     */
+    @ApiLog(value = "教育培训经历", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentTrainingInfo>> findList(EnrollmentTrainingInfo info) throws Exception {
+        List<EnrollmentTrainingInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询培训经历信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询培训经历信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentTrainingInfo> findById(EnrollmentTrainingInfo info) throws Exception {
+        EnrollmentTrainingInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
+
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentEduInfoService;
+import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentWorkInfoService;
+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;
+
+/**
+ * @author 王强
+ * @version 1.0
+ */
+@Slf4j
+@RestController
+@Api("工作经历")
+@RequestMapping(value = "/workInfo")
+public class EnrollmentWorkInfoController {
+
+    @Resource
+    private EnrollmentWorkInfoService service;
+
+
+    /**
+     * 保存教育经历
+     * @return
+     */
+    @ApiLog(value = "保存工作经历", type = LogTypeEnum.SAVE)
+    @PostMapping("save")
+    public ResponseEntity save(@Valid @RequestBody EnrollmentWorkInfo info) throws Exception {
+        service.saveOrUpdateWorkInfo(info);
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 删除教育经历
+     * @return
+     */
+    @ApiLog(value = "删除工作经历", type = LogTypeEnum.SAVE)
+    @PostMapping("delete")
+    public ResponseEntity<String> delete(@Valid @RequestBody EnrollmentWorkInfo info) throws Exception {
+        service.removeById(info.getId());
+        return ResponseEntity.ok ("操作成功");
+    }
+
+    /**
+     * 教育经历列表
+     * @return
+     */
+    @ApiLog(value = "工作经历列表", type = LogTypeEnum.SAVE)
+    @GetMapping("list")
+    public ResponseEntity<List<EnrollmentWorkInfo>> findList(EnrollmentWorkInfo info) throws Exception {
+        List<EnrollmentWorkInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        return ResponseEntity.ok (list);
+    }
+
+    /**
+     * 根据id查询教育经历信息
+     * @return
+     */
+    @ApiLog(value = "根据id查询工作经历信息", type = LogTypeEnum.SAVE)
+    @GetMapping("findById")
+    public ResponseEntity<EnrollmentWorkInfo> findById(EnrollmentWorkInfo info) throws Exception {
+        EnrollmentWorkInfo res = service.findById(info.getId());
+        return ResponseEntity.ok (res);
+    }
+}

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

@@ -0,0 +1,48 @@
+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_certificate_info")
+public class EnrollmentCertificateInfo extends BaseEntity {
+
+    //证书名称
+    private String certificateName;
+
+    //其他证书名称
+    private String otherCertificateName;
+
+   //证书编号
+    private String certificateNumber;
+
+    //发证机构
+    private String issuingAuthority;
+
+    //获得日期
+    private Date issueDate;
+
+    //有效期至
+    private Date validUntil;
+
+    //证书附件（文件对象列表）
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> certificateAttachment;
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+    /** 用户id */
+    private String userId;
+
+}

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

@@ -0,0 +1,80 @@
+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_edu_info")
+public class EnrollmentEduInfo extends BaseEntity {
+
+    /** 毕业院校 */
+    private String graduatedFrom;
+
+    /** 其他毕业院校 */
+    private String otherGraduatedFrom;
+
+    /** 开始时间 */
+    private Date startDate;
+
+    /** 结束时间 */
+    private Date endDate;
+
+    /** 专业 */
+    private String speciality;
+
+    /** 学历 */
+    private String education;
+
+    /** 学位 */
+    private String degree;
+
+    /** 是否最高学历 */
+    private String isHighestEducation;
+
+    /** 是否最高学位 */
+    private String isHighestDegree;
+
+    /** 学习形式 */
+    private String learnForms;
+
+    /** 毕业类型 */
+    private String graduationType;
+
+    /** 培养方式 */
+    private String cultureMethod;
+
+    /** 专业描述 */
+    private String specialityDesc;
+
+    /** 关联入职数据id */
+    private String enrollmentRegistrationId;
+
+    /** 用户id */
+    private String userId;
+
+
+    /**
+     * 学历证书
+     */
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> educationFile;
+
+    /**
+     * 学位证书
+     */
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> degreeFile;
+
+
+}

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

@@ -0,0 +1,44 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 员工工作经历
+ * @version 1.0
+ * @date
+ */
+@Data
+@TableName("human_resources_enrollment_family_info")
+public class EnrollmentFamilyInfo extends BaseEntity {
+    /**
+     * 关联id
+     */
+    private String enrollmentRegistrationId;
+
+    //成员姓名
+    private String name;
+
+    //出生日期
+    private Date birthDate;
+
+    //与本人关系名称
+    private String relation;
+
+    //性别
+    private String gender;
+
+    //手机号码
+    private String mobile;
+
+    //工作单位
+    private String workUnit;
+
+    //联系电话
+    private String contactNumber;
+    /** 用户id */
+    private String userId;
+}

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

@@ -0,0 +1,48 @@
+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.List;
+
+/**
+ * 培训经历
+ * @version 1.0
+ * @date
+ */
+@Data
+@TableName("human_resources_enrollment_language_info")
+public class EnrollmentLanguageInfo extends BaseEntity {
+
+    //语言
+    private String language;
+
+    //是否母语
+    private String isNative;
+
+    //掌握程度
+    private String proficiency;
+
+    //书写能力
+    private String writingAbility;
+
+    //阅读能力
+    private String readingAbility;
+
+    //口语能力
+    private String speakingAbility;
+
+    //附件
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> files;
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+    /** 用户id */
+    private String userId;
+
+
+}

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

@@ -120,4 +120,24 @@ public class EnrollmentRegistration extends BaseEntity {
     @TableField(exist = false)
     private String newPassword; //新密码
 
+    @TableField(exist = false)
+    private List<EnrollmentEduInfo> eduInfoList; //教育经历
+    @TableField(exist = false)
+    private List<EnrollmentWorkInfo> workInfoList; //工作经历
+    @TableField(exist = false)
+    private List<EnrollmentTrainingInfo> trainingInfoList; //培训经历
+    @TableField(exist = false)
+    private List<EnrollmentCertificateInfo> certificateInfoList; //资质证书
+    @TableField(exist = false)
+    private List<EnrollmentSkillInfo> skillInfoList; //专业技能
+    @TableField(exist = false)
+    private List<EnrollmentLanguageInfo> languageInfoList; //语言能力
+    @TableField(exist = false)
+    private List<EnrollmentFamilyInfo> familyInfoList; //家庭成员
+    @TableField(exist = false)
+    private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
+
+    @TableField(exist = false)
+    private String loginName; //登录名
+
 }

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

@@ -0,0 +1,35 @@
+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_reward_info")
+public class EnrollmentRewardInfo extends BaseEntity {
+    //奖项
+    private String name;
+    //获奖日期
+    private Date rewardDate;
+    //简述
+    private String description;
+    //附件
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> files;
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+    /** 用户id */
+    private String userId;
+
+}

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

@@ -0,0 +1,43 @@
+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_skill_info")
+public class EnrollmentSkillInfo extends BaseEntity {
+
+
+   //("名称")
+    private String name;
+
+   //("掌握程度")
+    private String proficiency;
+
+   //("种类")
+    private String category;
+
+   //("使用时间")
+    private String usageTime;
+
+    //附件
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> files;
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+
+    /** 用户id */
+    private String userId;
+}

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

@@ -0,0 +1,43 @@
+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_training_info")
+public class EnrollmentTrainingInfo extends BaseEntity {
+
+
+
+    /** 名称 */
+    private String name;
+
+    /** 培训机构 */
+    private String trainingInstitution;
+
+    /** 培训成绩 */
+    private String trainingResult;
+
+    /** 关联id */
+    private String enrollmentRegistrationId;
+
+    /**
+     * 附件
+     */
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> files;
+    /** 用户id */
+    private String userId;
+
+}

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

@@ -0,0 +1,56 @@
+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_work_info")
+public class EnrollmentWorkInfo extends BaseEntity {
+    /**
+     * 关联id
+     */
+    private String enrollmentRegistrationId;
+
+    /**
+     * 单位名称
+     */
+    private String companyName;
+
+    /**
+     * 职务/职位名称
+     */
+    private String position;
+
+    /**
+     * 开始时间（工作开始日期）
+     */
+    private Date startDate;
+
+    /**
+     * 结束时间（工作结束日期）
+     */
+    private Date endDate;
+
+    /**
+     * 证明人（例如单位负责人、同事等）
+     */
+    private String certifier;
+
+    /**
+     * 是否为本单位工作经历（true 表示是，false 表示否）
+     */
+    private String isCurrentCompanyExperience;
+    /** 用户id */
+    private String userId;
+}

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

@@ -0,0 +1,27 @@
+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.EnrollmentCertificateInfo;
+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 EnrollmentCertificateInfoMapper extends BaseMapper<EnrollmentCertificateInfo> {
+    EnrollmentCertificateInfo getById(@Param("id") String id);
+
+    List<EnrollmentCertificateInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,28 @@
+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.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentKeyCard;
+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 EnrollmentEduInfoMapper extends BaseMapper<EnrollmentEduInfo> {
+    EnrollmentEduInfo getById(@Param("id") String id);
+
+    List<EnrollmentEduInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,24 @@
+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.EnrollmentFamilyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
+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 EnrollmentFamilyInfoMapper extends BaseMapper<EnrollmentFamilyInfo> {
+    EnrollmentFamilyInfo getById(@Param("id") String id);
+
+    List<EnrollmentFamilyInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,28 @@
+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.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+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 EnrollmentLanguageInfoMapper extends BaseMapper<EnrollmentLanguageInfo> {
+    EnrollmentLanguageInfo getById(@Param("id") String id);
+
+    List<EnrollmentLanguageInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,28 @@
+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.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo;
+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 EnrollmentRewardInfoMapper extends BaseMapper<EnrollmentRewardInfo> {
+    EnrollmentRewardInfo getById(@Param("id") String id);
+
+    List<EnrollmentRewardInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,28 @@
+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.EnrollmentCertificateInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+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 EnrollmentSkillInfoMapper extends BaseMapper<EnrollmentSkillInfo> {
+    EnrollmentSkillInfo getById(@Param("id") String id);
+
+    List<EnrollmentSkillInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,28 @@
+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.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+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 EnrollmentTrainingInfoMapper extends BaseMapper<EnrollmentTrainingInfo> {
+    EnrollmentTrainingInfo getById(@Param("id") String id);
+
+    List<EnrollmentTrainingInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id);
+
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,25 @@
+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.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
+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 EnrollmentWorkInfoMapper extends BaseMapper<EnrollmentWorkInfo> {
+    EnrollmentWorkInfo getById(@Param("id") String id);
+
+    List<EnrollmentWorkInfo> getByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+   void deleteByRegistrationId(@Param("enrollmentRegistrationId") String enrollmentRegistrationId);
+
+}

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

@@ -0,0 +1,67 @@
+<?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.EnrollmentCertificateInfoMapper">
+
+    <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.certificate_name,
+        a.other_certificate_name,
+        a.certificate_number,
+        a.issuing_authority,
+        a.issue_date,
+        a.valid_until,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from human_resources_enrollment_certificate_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_certificate_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_certificate_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/EnrollmentEduInfoMapper.xml

@@ -0,0 +1,75 @@
+<?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.EnrollmentEduInfoMapper">
+
+    <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.graduated_from,
+        a.other_graduated_from,
+        a.start_date,
+        a.end_date,
+        a.speciality,
+        a.education,
+        a.degree,
+        a.is_highest_education,
+        a.is_highest_degree,
+        a.learn_forms,
+        a.graduation_type,
+        a.culture_method,
+        a.speciality_desc,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_edu_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_edu_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_edu_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/EnrollmentFamilyInfoMapper.xml

@@ -0,0 +1,54 @@
+<?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.EnrollmentFamilyInfoMapper">
+
+    <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.name,
+        a.birth_date,
+        a.relation,
+        a.gender,
+        a.mobile,
+        a.work_unit,
+        a.contact_number,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentFamilyInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_family_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentFamilyInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_family_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_work_info
+        WHERE enrollment_registration_id = #{enrollmentRegistrationId}
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,68 @@
+<?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.EnrollmentLanguageInfoMapper">
+
+    <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.language,
+        a.is_native,
+        a.proficiency,
+        a.writing_ability,
+        a.reading_ability,
+        a.speaking_ability,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_language_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_language_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_language_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/EnrollmentRegistrationMapper.xml

@@ -113,10 +113,12 @@
         c.gs_account_holder as gsAccountHolder,
         c.gs_account_holder_front as gsAccountHolderFront,
         c.gs_account_holder_opposite as gsAccountHolderOpposite,
-        c.id as wageCardId
+        c.id as wageCardId,
+        su.login_name as loginName
         from human_resources_enrollment_registration a
         left join human_resources_enrollment_social_security_card b on a.id = b.enrollment_registration_id and b.del_flag = '0'
         left join human_resources_enrollment_wage_card c on a.id = c.enrollment_registration_id and c.del_flag = '0'
+        left join sys_user su on a.user_id = su.id and su.del_flag = '0'
         where a.id = #{id} and a.del_flag = '0'
     </select>
     <select id="getInfoByUserId"

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

@@ -0,0 +1,65 @@
+<?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.EnrollmentRewardInfoMapper">
+
+    <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.enrollment_registration_id,
+        a.name,
+        a.reward_date,
+        a.description,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_reward_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_reward_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_reward_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/EnrollmentSkillInfoMapper.xml

@@ -0,0 +1,66 @@
+<?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.EnrollmentSkillInfoMapper">
+
+    <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.name,
+        a.proficiency,
+        a.category,
+        a.usage_time,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_skill_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_skill_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_skill_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/EnrollmentTrainingInfoMapper.xml

@@ -0,0 +1,65 @@
+<?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.EnrollmentTrainingInfoMapper">
+
+    <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.name,
+        a.training_institution,
+        a.training_result,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_training_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_training_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <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/EnrollmentWorkInfoMapper.xml

@@ -0,0 +1,54 @@
+<?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.EnrollmentWorkInfoMapper">
+
+    <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.company_name,
+        a.position,
+        a.start_date,
+        a.end_date,
+        a.certifier,
+        a.is_current_company_experience,
+        a.enrollment_registration_id,
+        a.user_id,
+        a.remarks
+    </sql>
+
+    <select id="getByRegistrationId"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_enrollment_work_info a
+        where a.del_flag = '0'
+        <if test="enrollmentRegistrationId != null and enrollmentRegistrationId != ''">
+            and a.enrollment_registration_id = #{enrollmentRegistrationId}
+        </if>
+        <if test="userId != null and userId != ''">
+            and a.user_id = #{userId}
+        </if>
+    </select>
+
+    <select id="getById"
+            resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo">
+        select
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
+        from human_resources_enrollment_work_info a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
+        where a.id = #{id} and a.del_flag = '0'
+    </select>
+
+    <delete id="deleteByRegistrationId" parameterType="String">
+        DELETE FROM human_resources_enrollment_work_info
+        WHERE enrollment_registration_id = #{enrollmentRegistrationId}
+    </delete>
+
+</mapper>

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

@@ -0,0 +1,150 @@
+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.EnrollmentCertificateInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentCertificateInfoMapper;
+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 EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCertificateInfoMapper, EnrollmentCertificateInfo> {
+
+    @Resource
+    private EnrollmentCertificateInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentCertificateInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentCertificateInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentCertificateInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setCertificateAttachment(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentCertificateInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentCertificateInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentCertificateInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentCertificateInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentCertificateInfo info){
+        String id = UUID.randomUUID().toString().replace("-", "");
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        // 保存附件
+        if (ObjectUtil.isNotEmpty(info.getCertificateAttachment())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            info.getCertificateAttachment().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 = "certificate";
+                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(EnrollmentCertificateInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(info);
+        // 资质证书附件
+        if (ObjectUtil.isNotEmpty(info.getCertificateAttachment())) {
+            SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(info.getId());
+            AtomicInteger sort = new AtomicInteger(1);
+            info.getCertificateAttachment().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 = "certificate";
+                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/EnrollmentEduInfoService.java

@@ -0,0 +1,220 @@
+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.flowable.feign.IFlowableApi;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentKeyCard;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRiceCard;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentEduInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentKeyCardMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.utils.SnowFlake;
+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.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMapper, EnrollmentEduInfo> {
+
+    @Resource
+    private EnrollmentEduInfoMapper eduInfoMapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentEduInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        eduInfoMapper.delete(queryWrapper);
+    }
+
+    public EnrollmentEduInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentEduInfo info = eduInfoMapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = eduInfoMapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            for (WorkAttachmentInfoDTO i : files) {
+                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
+            }
+            Map<String, List<WorkAttachmentInfoDTO>> groupedMap = files.stream()
+                    .collect(Collectors.groupingBy(WorkAttachmentInfoDTO::getAttachmentFlag));
+            List<WorkAttachmentInfoDTO> educationFiles = groupedMap.getOrDefault("education", new ArrayList<>());
+            List<WorkAttachmentInfoDTO> degreeFiles = groupedMap.getOrDefault("degree", new ArrayList<>());
+            info.setEducationFile(educationFiles);
+            info.setDegreeFile(degreeFiles);
+        }
+        return info;
+    }
+
+    public List<EnrollmentEduInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentEduInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentEduInfo> enrollmentEduInfos = eduInfoMapper.selectList(queryWrapper);
+        return enrollmentEduInfos;
+    }
+
+    public void saveOrUpdateEduInfo(EnrollmentEduInfo enrollmentEduInfo) {
+        if (enrollmentEduInfo == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(enrollmentEduInfo.getId())) {
+            // 新增
+            add(enrollmentEduInfo);
+        } else {
+            // 更新
+            update(enrollmentEduInfo);
+        }
+    }
+
+    /**
+     * 新增
+     * @param enrollmentEduInfo
+     */
+    public void add(EnrollmentEduInfo enrollmentEduInfo){
+        String id = UUID.randomUUID().toString().replace("-", "");
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        // 保存学历证书
+        if (ObjectUtil.isNotEmpty(enrollmentEduInfo.getEducationFile())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            enrollmentEduInfo.getEducationFile().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 = "education";
+                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();
+            });
+        }
+        // 保存学位证书
+        if (ObjectUtil.isNotEmpty(enrollmentEduInfo.getDegreeFile())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            enrollmentEduInfo.getDegreeFile().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 = "degree";
+                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();
+            });
+        }
+        enrollmentEduInfo.setId(id);
+        eduInfoMapper.insert(enrollmentEduInfo);
+    }
+
+    public void update(EnrollmentEduInfo enrollmentEduInfo){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        eduInfoMapper.updateById(enrollmentEduInfo);
+        SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(enrollmentEduInfo.getId());
+        // 保存学历证明
+        if (ObjectUtil.isNotEmpty(enrollmentEduInfo.getEducationFile())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            enrollmentEduInfo.getEducationFile().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 = enrollmentEduInfo.getId();
+                String attachmentFlag = "education";
+                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();
+            });
+        }
+        // 保存学位证明
+        if (ObjectUtil.isNotEmpty(enrollmentEduInfo.getDegreeFile())) {
+            AtomicInteger sort = new AtomicInteger(1);
+            enrollmentEduInfo.getDegreeFile().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 = enrollmentEduInfo.getId();
+                String attachmentFlag = "degree";
+                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();
+            });
+        }
+    }
+
+    /**
+     * 新增或者更新教育经历数据
+     * @param aDto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate1(EnrollmentRegistration aDto) {
+        // 删除旧数据
+        deleteByRegistrationId(aDto.getId());
+        //插入
+        for (EnrollmentEduInfo b : aDto.getEduInfoList()) {
+            b.setId(null);
+            b.setEnrollmentRegistrationId(aDto.getId());
+            eduInfoMapper.insert(b);
+        }
+    }
+
+}

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

@@ -0,0 +1,91 @@
+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.EnrollmentFamilyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentFamilyInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLanguageInfoMapper;
+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 EnrollmentFamilyInfoService extends ServiceImpl<EnrollmentFamilyInfoMapper, EnrollmentFamilyInfo> {
+
+    @Resource
+    private EnrollmentFamilyInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentFamilyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentFamilyInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentFamilyInfo info = mapper.getById(id);
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentFamilyInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentFamilyInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentFamilyInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentFamilyInfo info) {
+        if (info == null) {
+            return ;
+        }
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentFamilyInfo info){
+        mapper.insert(info);
+    }
+
+    public void update(EnrollmentFamilyInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(info);
+    }
+
+}

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

@@ -0,0 +1,150 @@
+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.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLanguageInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSkillInfoMapper;
+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 EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguageInfoMapper, EnrollmentLanguageInfo> {
+
+    @Resource
+    private EnrollmentLanguageInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentLanguageInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentLanguageInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentLanguageInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setFiles(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentLanguageInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentLanguageInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentLanguageInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentLanguageInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentLanguageInfo 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 = "language";
+                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(EnrollmentLanguageInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(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 = "language";
+                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

@@ -17,10 +17,7 @@ import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
-import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentKeyCard;
-import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
-import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocialSecurityCard;
-import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWageCard;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentRegistrationMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocialSecurityCardMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentWageCardMapper;
@@ -71,6 +68,25 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     @Resource
     private DingTalkUtils dingTalkUtils;
 
+    @Resource
+    private EnrollmentEduInfoService eduInfoService;
+
+    @Resource
+    private EnrollmentWorkInfoService workInfoService;
+    @Resource
+    private EnrollmentTrainingInfoService trainingInfoService;
+
+    @Resource
+    private EnrollmentCertificateInfoService certificateInfoService;
+    @Resource
+    private EnrollmentSkillInfoService skillInfoService;
+
+    @Resource
+    private EnrollmentLanguageInfoService languageInfoService;
+    @Resource
+    private EnrollmentFamilyInfoService familyInfoService;
+    @Resource
+    private EnrollmentRewardInfoService rewardInfoService;
     /**
      * 实习人员登记表信息
      *
@@ -622,11 +638,44 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             }
             info.setRoleIdList(roles);
             info.setPostIdList(posts);
+
+            //查询教育经历数据
+            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByRegistrationId(id);
+            info.setEduInfoList(eduInfoList);
+
+            //查询工作经历数据
+            List<EnrollmentWorkInfo> workInfos = workInfoService.findByRegistrationId(id);
+            info.setWorkInfoList(workInfos);
+
+            //查询培训经历数据
+            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByRegistrationId(id);
+            info.setTrainingInfoList(trainingInfos);
+
+            //查询资质证书数据
+            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByRegistrationId(id);
+            info.setCertificateInfoList(certificateInfoList);
+
+            //查询专业技能数据
+            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByRegistrationId(id);
+            info.setSkillInfoList(skillInfoList);
+
+            //查询语言能力数据
+            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByRegistrationId(id);
+            info.setLanguageInfoList(languageInfoList);
+
+            //查询家庭成员数据
+            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByRegistrationId(id);
+            info.setFamilyInfoList(familyInfoList);
+
+            //查询奖项信息
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByRegistrationId(id);
+            info.setRewardInfoList(rewardInfoList);
         }
 
         return info;
     }
 
+
     public Integer findByUserId(String userId) throws Exception {
         QueryWrapper<EnrollmentRegistration> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
@@ -769,21 +818,23 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             //钉钉逻辑
         }
 
-        //修改密码
+        //更新用户信息
         String newPassword = report.getNewPassword();
         String confirmNewPassword = report.getConfirmNewPassword();
+        String loginName = report.getLoginName();
         UserDTO userDTO1 =  SpringUtil.getBean(IUserApi.class).getById(reportData.getUserId());
-        if(StringUtils.isNotBlank(newPassword) && StringUtils.isNotBlank(confirmNewPassword)){
-            if (newPassword.equals(confirmNewPassword)){
-                userDTO1.setId(reportData.getUserId());
-                userDTO1.setPassword(SecurityUtils.encryptPassword(newPassword));
-                userDTO1.setUpPassword("0");
-                SpringUtil.getBean(IUserApi.class).saveOrUpdate(userDTO1);
-                UserUtils.deleteCache(userDTO1);
+        if((StringUtils.isNotBlank(newPassword) && StringUtils.isNotBlank(confirmNewPassword)) || StringUtils.isNotBlank(loginName) ){
+            if(StringUtils.isNotBlank(newPassword) && StringUtils.isNotBlank(confirmNewPassword)){
+                if (newPassword.equals(confirmNewPassword)){
+                    userDTO1.setId(reportData.getUserId());
+                    userDTO1.setPassword(SecurityUtils.encryptPassword(newPassword));
+                }
             }
+            userDTO1.setLoginName(loginName);
+            SpringUtil.getBean(IUserApi.class).saveOrUpdate(userDTO1);
+            UserUtils.deleteCache(userDTO1);
         }
 
-
         mapper.updateById(report);
 
         if (StringUtils.isNotBlank(report.getSocialSecurityNumber())) {
@@ -926,6 +977,9 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             }
         }
 
+        //处理教育经历信息
+        //eduInfoService.saveOrUpdate(reportData);
+
     }
 
     public void insertIntoEnrollmentRegistrationInfo(String value) {

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

@@ -0,0 +1,150 @@
+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.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLanguageInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentRewardInfoMapper;
+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 EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInfoMapper, EnrollmentRewardInfo> {
+
+    @Resource
+    private EnrollmentRewardInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentRewardInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentRewardInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentRewardInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setFiles(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentRewardInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentRewardInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentRewardInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentRewardInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentRewardInfo 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 = "reward";
+                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(EnrollmentRewardInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(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 = "reward";
+                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/EnrollmentSkillInfoService.java

@@ -0,0 +1,150 @@
+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.EnrollmentCertificateInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentCertificateInfoMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSkillInfoMapper;
+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 EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoMapper, EnrollmentSkillInfo> {
+
+    @Resource
+    private EnrollmentSkillInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentSkillInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentSkillInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentSkillInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setFiles(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentSkillInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentSkillInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentSkillInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentSkillInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentSkillInfo 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 = "skill";
+                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(EnrollmentSkillInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(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 = "skill";
+                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/EnrollmentTrainingInfoService.java

@@ -0,0 +1,149 @@
+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.EnrollmentEduInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentEduInfoMapper;
+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.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainingInfoMapper, EnrollmentTrainingInfo> {
+
+    @Resource
+    private EnrollmentTrainingInfoMapper mapper;
+
+    public void deleteByRegistrationId(String id){
+        QueryWrapper<EnrollmentTrainingInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        mapper.delete(queryWrapper);
+    }
+
+    public EnrollmentTrainingInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentTrainingInfo info = mapper.getById(id);
+        // 查询附件信息
+        List<WorkAttachmentInfoDTO> files = mapper.findDtos(id);
+        if (CollectionUtils.isNotEmpty(files)) {
+            info.setFiles(files);
+        }
+        return info;
+    }
+
+    /**
+     * 根据关联id查询所有数据
+     * @param id
+     * @return
+     */
+    public List<EnrollmentTrainingInfo> findByRegistrationId(String id)  {
+        QueryWrapper<EnrollmentTrainingInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id",id);
+        List<EnrollmentTrainingInfo> infos = mapper.selectList(queryWrapper);
+        return infos;
+    }
+
+    public void saveOrUpdateInfo(EnrollmentTrainingInfo info) {
+        if (info == null) {
+            return ;
+        }
+
+        if (!StringUtils.isNotBlank(info.getId())) {
+            // 新增
+            add(info);
+        } else {
+            // 更新
+            update(info);
+        }
+    }
+
+    /**
+     * 新增
+     * @param info
+     */
+    public void add(EnrollmentTrainingInfo 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 = "training";
+                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(EnrollmentTrainingInfo info){
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        mapper.updateById(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 = "training";
+                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/EnrollmentWorkInfoService.java

@@ -0,0 +1,73 @@
+package com.jeeplus.human.enrollment.enrollmentRegistration.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentWorkInfoMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @version 1.0
+ * @date 2023-10-17 8:57
+ */
+@Service
+@Transactional
+public class EnrollmentWorkInfoService extends ServiceImpl<EnrollmentWorkInfoMapper, EnrollmentWorkInfo> {
+
+    @Resource
+    private EnrollmentWorkInfoMapper workInfoMapper;
+
+    public void deleteByRegistrationId(String id) {
+        QueryWrapper<EnrollmentWorkInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id", id);
+        workInfoMapper.delete(queryWrapper);
+    }
+
+    public EnrollmentWorkInfo findById(String id) throws Exception {
+        // 查询基础信息表
+        EnrollmentWorkInfo info = workInfoMapper.getById(id);
+        return info;
+    }
+
+    public List<EnrollmentWorkInfo> findByRegistrationId(String id) {
+        QueryWrapper<EnrollmentWorkInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("enrollment_registration_id", id);
+        List<EnrollmentWorkInfo> workInfos = workInfoMapper.selectList(queryWrapper);
+        return workInfos;
+    }
+
+    public void saveOrUpdateWorkInfo(EnrollmentWorkInfo workInfo) {
+        if (workInfo == null) {
+            return;
+        }
+
+        if (!StringUtils.isNotBlank(workInfo.getId())) {
+            // 新增
+            add(workInfo);
+        } else {
+            // 更新
+            update(workInfo);
+        }
+    }
+
+
+    /**
+     * 新增
+     *
+     * @param workInfo
+     */
+    public void add(EnrollmentWorkInfo workInfo) {
+        workInfoMapper.insert(workInfo);
+    }
+
+    public void update(EnrollmentWorkInfo workInfo) {
+        workInfoMapper.updateById(workInfo);
+    }
+}
+
+