入职信息调整

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

@@ -56,7 +56,7 @@ public class EnrollmentCertificateInfoController {
     @ApiLog(value = "资质证书", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentCertificateInfo>> findList(EnrollmentCertificateInfo info) throws Exception {
-        List<EnrollmentCertificateInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentCertificateInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -82,7 +82,7 @@ public class EnrollmentEduInfoController {
     @ApiLog(value = "教育经历列表", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentEduInfo>> findList(EnrollmentEduInfo eduInfo) throws Exception {
-        List<EnrollmentEduInfo> list = eduInfoService.findByRegistrationId(eduInfo.getEnrollmentRegistrationId());
+        List<EnrollmentEduInfo> list = eduInfoService.findByUserId(eduInfo.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -56,7 +56,7 @@ public class EnrollmentFamilyInfoController {
     @ApiLog(value = "家庭成员", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentFamilyInfo>> findList(EnrollmentFamilyInfo info) throws Exception {
-        List<EnrollmentFamilyInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentFamilyInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -56,7 +56,7 @@ public class EnrollmentLanguageInfoController {
     @ApiLog(value = "语言能力", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentLanguageInfo>> findList(EnrollmentLanguageInfo info) throws Exception {
-        List<EnrollmentLanguageInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentLanguageInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -58,7 +58,7 @@ public class EnrollmentRewardInfoController {
     @ApiLog(value = "奖项信息", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentRewardInfo>> findList(EnrollmentRewardInfo info) throws Exception {
-        List<EnrollmentRewardInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentRewardInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -58,7 +58,7 @@ public class EnrollmentSkillInfoController {
     @ApiLog(value = "专业技能", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentSkillInfo>> findList(EnrollmentSkillInfo info) throws Exception {
-        List<EnrollmentSkillInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentSkillInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -58,7 +58,7 @@ public class EnrollmentTrainingInfoController {
     @ApiLog(value = "教育培训经历", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentTrainingInfo>> findList(EnrollmentTrainingInfo info) throws Exception {
-        List<EnrollmentTrainingInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentTrainingInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -58,7 +58,7 @@ public class EnrollmentWorkInfoController {
     @ApiLog(value = "工作经历列表", type = LogTypeEnum.SAVE)
     @GetMapping("list")
     public ResponseEntity<List<EnrollmentWorkInfo>> findList(EnrollmentWorkInfo info) throws Exception {
-        List<EnrollmentWorkInfo> list = service.findByRegistrationId(info.getEnrollmentRegistrationId());
+        List<EnrollmentWorkInfo> list = service.findByUserId(info.getUserId());
         return ResponseEntity.ok (list);
     }
 

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

@@ -3,10 +3,12 @@ package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -47,8 +49,14 @@ public class EnrollmentRegistration extends BaseEntity {
     private String graduatedOrNot;      //是否毕业
     private String englishLevel;        //英语等级
     private String ncre;                //计算机等级
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String joinIndustryDate;   //加入行业日期
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String joinWorkDate;   //参加工作日期
     @Excel(name = "所属部门",width = 25)
     private String department;          //所属部门
+    private String trialDuration;   //试用期时长（月）
+    private String trialEndDate;   //试用结束日期
     private String entryDate;           //进所日期
     private String contractStartDate;   //合同开始日期
     private String contractEndDate;   //合同结束日期
@@ -138,6 +146,11 @@ public class EnrollmentRegistration extends BaseEntity {
     private List<EnrollmentRewardInfo> rewardInfoList; //奖项信息
 
     @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> idCardFront; //身份证正面
+    @TableField(exist = false)
+    private List<WorkAttachmentInfoDTO> idCardBack; //身份证反面
+
+    @TableField(exist = false)
     private String loginName; //登录名
 
 }

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.ExportDTO;
 import com.jeeplus.human.practice.register.domain.Registration;
+import com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -83,4 +84,7 @@ public interface EnrollmentRegistrationMapper extends BaseMapper<EnrollmentRegis
     根据手机号查询信息
      */
     EnrollmentRegistration getByMobile(@Param("mobilePhone") String mobilePhone);
+
+    List<WorkAttachmentInfoDTO> findDtos(@Param("id")String id,@Param("attachmentFlag")String attachmentFlag);
+
 }

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

@@ -26,9 +26,6 @@
         <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>
@@ -40,7 +37,7 @@
         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 human_resources_enrollment_registration re on a.user_id = re.user_id
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

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

@@ -33,9 +33,6 @@
         <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>
@@ -48,7 +45,7 @@
         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 human_resources_enrollment_registration re on a.user_id = re.user_id
         left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>

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

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

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

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

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

@@ -44,6 +44,10 @@
         a.remarks,
         a.on_job_status,
         a.process_type,
+        a.join_work_date,
+        a.join_industry_date,
+        a.trial_duration,
+        a.trial_end_date,
         a.dd_type
     </sql>
     <update id="updateStatusById">
@@ -206,4 +210,21 @@
 
         where user_id =#{userId} and del_flag = '0'
     </update>
+
+    <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}
+          AND attachment_flag = #{attachmentFlag}
+
+    </select>
 </mapper>

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

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

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

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

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

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

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

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

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

@@ -8,6 +8,7 @@ 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.EnrollmentRegistration;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentCertificateInfoMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentTrainingInfoMapper;
@@ -16,7 +17,7 @@ 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 com.jeeplus.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,16 +58,18 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentCertificateInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentCertificateInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentCertificateInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if(StringUtils.isNotBlank(id)){
+            queryWrapper.eq("user_id",id);
+        }
         List<EnrollmentCertificateInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }
 
+
     public void saveOrUpdateInfo(EnrollmentCertificateInfo info) {
         if (info == null) {
             return ;

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

@@ -7,26 +7,19 @@ 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 com.jeeplus.utils.StringUtils;
 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;
@@ -42,9 +35,9 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
     @Resource
     private EnrollmentEduInfoMapper eduInfoMapper;
 
-    public void deleteByRegistrationId(String id){
+    public void deleteByRegistrationId(String id) {
         QueryWrapper<EnrollmentEduInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        queryWrapper.eq("enrollment_registration_id", id);
         eduInfoMapper.delete(queryWrapper);
     }
 
@@ -55,7 +48,7 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
         List<WorkAttachmentInfoDTO> files = eduInfoMapper.findDtos(id);
         if (CollectionUtils.isNotEmpty(files)) {
             for (WorkAttachmentInfoDTO i : files) {
-                i.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(i.getBy()));
+                i.setCreateBy(SpringUtil.getBean(IUserApi.class).getById(i.getBy()));
             }
             Map<String, List<WorkAttachmentInfoDTO>> groupedMap = files.stream()
                     .collect(Collectors.groupingBy(WorkAttachmentInfoDTO::getAttachmentFlag));
@@ -67,16 +60,33 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
         return info;
     }
 
-    public List<EnrollmentEduInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentEduInfo> findByUserId(String id) {
         QueryWrapper<EnrollmentEduInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentEduInfo> enrollmentEduInfos = eduInfoMapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentEduInfo eduInfo : enrollmentEduInfos) {
+            List<WorkAttachmentInfoDTO> files = eduInfoMapper.findDtos(eduInfo.getId());
+            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<>());
+                eduInfo.setEducationFile(educationFiles);
+                eduInfo.setDegreeFile(degreeFiles);
+            }
+        }
         return enrollmentEduInfos;
     }
 
     public void saveOrUpdateEduInfo(EnrollmentEduInfo enrollmentEduInfo) {
         if (enrollmentEduInfo == null) {
-            return ;
+            return;
         }
 
         if (!StringUtils.isNotBlank(enrollmentEduInfo.getId())) {
@@ -90,56 +100,57 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
 
     /**
      * 新增
+     *
      * @param enrollmentEduInfo
      */
-    public void add(EnrollmentEduInfo 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->{
+            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<>();
+                Map<String, String> map = new HashMap<>();
                 String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);
                 String userDTOInfo = JSON.toJSONString(userDTO);
-                String attachmentId =id;
+                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);
+                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->{
+            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<>();
+                Map<String, String> map = new HashMap<>();
                 String workAttachmentDtoInfo = JSON.toJSONString(workAttachmentDto);
                 String userDTOInfo = JSON.toJSONString(userDTO);
-                String attachmentId =id;
+                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);
+                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();
             });
         }
@@ -147,55 +158,55 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
         eduInfoMapper.insert(enrollmentEduInfo);
     }
 
-    public void update(EnrollmentEduInfo 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());
+        SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(enrollmentEduInfo.getId());
         // 保存学历证明
         if (ObjectUtil.isNotEmpty(enrollmentEduInfo.getEducationFile())) {
             AtomicInteger sort = new AtomicInteger(1);
-            enrollmentEduInfo.getEducationFile().stream().forEach(item->{
+            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<>();
+                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);
+                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->{
+            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<>();
+                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);
+                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();
             });
         }
@@ -203,6 +214,7 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
 
     /**
      * 新增或者更新教育经历数据
+     *
      * @param aDto
      */
     @Transactional(rollbackFor = Exception.class)

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

@@ -1,31 +1,19 @@
 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 com.jeeplus.utils.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
@@ -52,12 +40,13 @@ public class EnrollmentFamilyInfoService extends ServiceImpl<EnrollmentFamilyInf
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentFamilyInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentFamilyInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentFamilyInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentFamilyInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }

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

@@ -57,16 +57,18 @@ public class EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguag
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentLanguageInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentLanguageInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentLanguageInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentLanguageInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }
 
+
     public void saveOrUpdateInfo(EnrollmentLanguageInfo info) {
         if (info == null) {
             return ;

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,6 +26,7 @@ import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.DingTalkU
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.ExportDTO;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.DingTalkUtils;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.SnowFlake;
+import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.*;
 import com.jeeplus.sys.service.dto.*;
 import com.jeeplus.sys.utils.UserUtils;
@@ -37,6 +39,8 @@ 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;
 
 /**
  * @author 王强
@@ -87,6 +91,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     private EnrollmentFamilyInfoService familyInfoService;
     @Resource
     private EnrollmentRewardInfoService rewardInfoService;
+
     /**
      * 实习人员登记表信息
      *
@@ -325,6 +330,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return map;
     }
 
+
     /**
      * 修改
      */
@@ -426,7 +432,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 }
                 dto.setRoleDTOList(roleIdList);
                 String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
-                if("1".equals(dictValue)){
+                if ("1".equals(dictValue)) {
                     //钉钉逻辑
                     //判断用户是否为 评估 或者 会计 员工
                     if (office.getTenantId().equals("10003") || office.getTenantId().equals("10001")) {
@@ -444,12 +450,12 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                                 //通过用户手机号查询钉钉是否存在用户信息，判断是更新还是新增
                                 if (StringUtils.isNotBlank(report.getDdId())) {
                                     dingTalkUserDTO.setUserid(report.getDdId());
-                                    dingTalkUtils.updateUser(dingTalkUserDTO,office.getTenantId());
+                                    dingTalkUtils.updateUser(dingTalkUserDTO, office.getTenantId());
                                 } else {
                                     //将手机号作为用户钉钉userID
                                     dingTalkUserDTO.setUserid(dingTalkUserDTO.getMobile());
                                     //添加钉钉用户，暂时无需处理返回
-                                    OapiV2UserCreateResponse oapiV2UserCreateResponse = dingTalkUtils.addUser(dingTalkUserDTO,office.getTenantId());
+                                    OapiV2UserCreateResponse oapiV2UserCreateResponse = dingTalkUtils.addUser(dingTalkUserDTO, office.getTenantId());
                                     //数插入ddid
                                     dto.setDdId(dingTalkUserDTO.getMobile());
                                     report.setDdId(dingTalkUserDTO.getMobile());
@@ -639,36 +645,37 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             info.setRoleIdList(roles);
             info.setPostIdList(posts);
 
+            String userId = info.getUserId();
             //查询教育经历数据
-            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByRegistrationId(id);
+            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId);
             info.setEduInfoList(eduInfoList);
 
             //查询工作经历数据
-            List<EnrollmentWorkInfo> workInfos = workInfoService.findByRegistrationId(id);
+            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId);
             info.setWorkInfoList(workInfos);
 
             //查询培训经历数据
-            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByRegistrationId(id);
+            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId);
             info.setTrainingInfoList(trainingInfos);
 
             //查询资质证书数据
-            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByRegistrationId(id);
+            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId);
             info.setCertificateInfoList(certificateInfoList);
 
             //查询专业技能数据
-            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByRegistrationId(id);
+            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId);
             info.setSkillInfoList(skillInfoList);
 
             //查询语言能力数据
-            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByRegistrationId(id);
+            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId);
             info.setLanguageInfoList(languageInfoList);
 
             //查询家庭成员数据
-            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByRegistrationId(id);
+            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId);
             info.setFamilyInfoList(familyInfoList);
 
             //查询奖项信息
-            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByRegistrationId(id);
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId);
             info.setRewardInfoList(rewardInfoList);
         }
 
@@ -707,6 +714,49 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             }
             info.setRoleIdList(roles);
             info.setPostIdList(posts);
+
+            // 查询身份证正反面信息
+            List<WorkAttachmentInfoDTO> idCardFront = mapper.findDtos(info.getIdCard(), "idCardFront");
+            List<WorkAttachmentInfoDTO> idCardBack = mapper.findDtos(info.getIdCard(), "idCardBack");
+            if (CollectionUtils.isNotEmpty(idCardFront)) {
+                info.setIdCardFront(idCardFront);
+            }
+            if (CollectionUtils.isNotEmpty(idCardBack)) {
+                info.setIdCardBack(idCardBack);
+            }
+
+            String userId = info.getUserId();
+            //查询教育经历数据
+            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId);
+            info.setEduInfoList(eduInfoList);
+
+            //查询工作经历数据
+            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId);
+            info.setWorkInfoList(workInfos);
+
+            //查询培训经历数据
+            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId);
+            info.setTrainingInfoList(trainingInfos);
+
+            //查询资质证书数据
+            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId);
+            info.setCertificateInfoList(certificateInfoList);
+
+            //查询专业技能数据
+            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId);
+            info.setSkillInfoList(skillInfoList);
+
+            //查询语言能力数据
+            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId);
+            info.setLanguageInfoList(languageInfoList);
+
+            //查询家庭成员数据
+            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId);
+            info.setFamilyInfoList(familyInfoList);
+
+            //查询奖项信息
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(id);
+            info.setRewardInfoList(rewardInfoList);
         }
 
         return info;
@@ -734,13 +784,13 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             if (userDTO != null) {
                 SpringUtil.getBean(IUserApi.class).deleteById(userDTO.getId());
                 String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
-                if("1".equals(dictValue)){
+                if ("1".equals(dictValue)) {
                     //删除钉钉表中的数据
                     //判断用户是否为 评估 或者 会计 员工
                     if (userDTO.getTenantDTO().getId().equals("10003") || userDTO.getTenantDTO().getId().equals("10001")) {
                         DingTalkUserDTO dingTalkUserDTO = new DingTalkUserDTO();
                         dingTalkUserDTO.setUserid(userDTO.getDdId());
-                        dingTalkUtils.deleteUser(dingTalkUserDTO,userDTO.getTenantDTO().getId());
+                        dingTalkUtils.deleteUser(dingTalkUserDTO, userDTO.getTenantDTO().getId());
                     }
                 }
 
@@ -755,7 +805,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         QueryWrapper<EnrollmentRegistration> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id_card", idCard);
         queryWrapper.eq("del_flag", 0);
-        if(StringUtils.isNotBlank(id)){
+        if (StringUtils.isNotBlank(id)) {
             queryWrapper.ne("id", id);
         }
 
@@ -779,6 +829,38 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return mapper.getFormalUserInfo();
     }
 
+    /**
+     * 保存身份证照片
+     *
+     * @param reportData
+     * @throws ApiException
+     */
+    public void updateIdCard(EnrollmentRegistration reportData) {
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        IWorkAttachmentApi workAttachmentApi = SpringUtil.getBean(IWorkAttachmentApi.class);
+        SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(reportData.getIdCard());
+        saveAttachments(reportData.getIdCardFront(), "idCardFront", reportData.getIdCard(), userDTO, workAttachmentApi);
+        saveAttachments(reportData.getIdCardBack(), "idCardBack", reportData.getIdCard(), userDTO, workAttachmentApi);
+    }
+
+    private void saveAttachments(List<WorkAttachmentInfoDTO> attachmentList, String flag, String attachmentId, UserDTO userDTO, IWorkAttachmentApi workAttachmentApi) {
+        if (ObjectUtil.isEmpty(attachmentList)) return;
+        AtomicInteger sort = new AtomicInteger(1);
+        for (WorkAttachmentInfoDTO item : attachmentList) {
+            WorkAttachmentInfo workAttachmentDto = new WorkAttachmentInfo();
+            workAttachmentDto.setName(item.getName());
+            workAttachmentDto.setSize(item.getSize());
+            workAttachmentDto.setUrl(item.getUrl());
+            Map<String, String> map = new HashMap<>();
+            map.put("workAttachmentDtoInfo", JSON.toJSONString(workAttachmentDto));
+            map.put("userDTOInfo", JSON.toJSONString(userDTO));
+            map.put("attachmentId", attachmentId);
+            map.put("attachmentFlag", flag);
+            map.put("sortInfo", String.valueOf(sort.getAndIncrement()));
+            workAttachmentApi.saveFile(map);
+        }
+    }
+
     public void updateRegistration(EnrollmentRegistration reportData) throws ApiException {
 
         //获取当前登录人信息
@@ -789,8 +871,18 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         report.setUpdateById(userDTO.getId());
         report.setUpdateTime(new Date());
 
+        if (StringUtils.isBlank(reportData.getJoinIndustryDate())) {
+            reportData.setJoinIndustryDate(null);
+        }
+
+        if (StringUtils.isBlank(reportData.getJoinWorkDate())) {
+            reportData.setJoinWorkDate(null);
+        }
+
+        updateIdCard(reportData);
+
         String dictValue = SpringUtil.getBean(IDictApi.class).getDictValue("dd_status", "dd_status", "0");
-        if("1".equals(dictValue)){
+        if ("1".equals(dictValue)) {
             //钉钉逻辑
             //获取用户所在部门信息
             OfficeDTO officeDto = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getDepartment());
@@ -809,7 +901,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                         dingTalkUserDTO.setDeptIdList(String.valueOf(dept.getDeptId()));
                         if (StringUtils.isNotBlank(report.getDdId())) {
                             dingTalkUserDTO.setUserid(report.getDdId());
-                            dingTalkUtils.updateUser(dingTalkUserDTO,tenantId);
+                            dingTalkUtils.updateUser(dingTalkUserDTO, tenantId);
                         }
                         break;
                     }
@@ -818,22 +910,22 @@ 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)) || 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);
-        }
+        ////更新用户信息
+        //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)) || 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);
 
@@ -977,9 +1069,6 @@ 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

@@ -57,16 +57,18 @@ public class EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInf
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentRewardInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentRewardInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentRewardInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentRewardInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }
 
+
     public void saveOrUpdateInfo(EnrollmentRewardInfo info) {
         if (info == null) {
             return ;

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

@@ -57,12 +57,13 @@ public class EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoM
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentSkillInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentSkillInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentSkillInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentSkillInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }

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

@@ -56,16 +56,18 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
 
     /**
      * 根据关联id查询所有数据
-     * @param id
      * @return
      */
-    public List<EnrollmentTrainingInfo> findByRegistrationId(String id)  {
+    public List<EnrollmentTrainingInfo> findByUserId(String id)  {
         QueryWrapper<EnrollmentTrainingInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id",id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id", id);
+        }
         List<EnrollmentTrainingInfo> infos = mapper.selectList(queryWrapper);
         return infos;
     }
 
+
     public void saveOrUpdateInfo(EnrollmentTrainingInfo info) {
         if (info == null) {
             return ;

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

@@ -34,9 +34,11 @@ public class EnrollmentWorkInfoService extends ServiceImpl<EnrollmentWorkInfoMap
         return info;
     }
 
-    public List<EnrollmentWorkInfo> findByRegistrationId(String id) {
+    public List<EnrollmentWorkInfo> findByUserId(String id) {
         QueryWrapper<EnrollmentWorkInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("enrollment_registration_id", id);
+        if (StringUtils.isNotBlank(id)) {
+            queryWrapper.eq("user_id",id);
+        }
         List<EnrollmentWorkInfo> workInfos = workInfoMapper.selectList(queryWrapper);
         return workInfos;
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -989,6 +989,33 @@ public class UserController {
     }
 
     /**
+     * 重置密码
+     *
+     * @param id
+     * @return
+     */
+    @DemoMode
+    @ApiLog("重置密码")
+    @PostMapping("/resetPwd")
+    public ResponseEntity resetPwd(String id) {
+        if(StringUtils.isNotBlank(id)){
+            User user = new User(id);
+            if(StringUtils.isNotBlank(user.getId())){
+                UserDTO userDTO =  SpringUtil.getBean(IUserApi.class).getById(user.getId());
+                user.setPassword(SecurityUtils.encryptPassword("123456"));
+                user.setUpPassword("1");
+                user.setUpdatePasswordDate(new Date());
+                userService.updateById(user);
+                UserUtils.deleteCache(userDTO);
+                return ResponseEntity.ok("重置密码成功！");
+            }else{
+                return ResponseEntity.badRequest().body("参数错误！");
+            }
+        }
+        return ResponseEntity.badRequest().body("参数错误！");
+    }
+
+    /**
      * 修改密码(超过90天未修改密码)
      *
      * @param oldPassword