个人信息调整

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

@@ -50,13 +50,14 @@ public class EnrollmentRegistration extends BaseEntity {
     private String englishLevel;        //英语等级
     private String ncre;                //计算机等级
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String joinIndustryDate;   //加入行业日期
+    private Date joinIndustryDate;   //加入行业日期
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private String joinWorkDate;   //参加工作日期
+    private Date joinWorkDate;   //参加工作日期
     @Excel(name = "所属部门",width = 25)
     private String department;          //所属部门
     private String trialDuration;   //试用期时长（月）
-    private String trialEndDate;   //试用结束日期
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private Date trialEndDate;   //试用结束日期
     private String entryDate;           //进所日期
     private String contractStartDate;   //合同开始日期
     private String contractEndDate;   //合同结束日期

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

@@ -66,6 +66,13 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
             queryWrapper.eq("user_id",id);
         }
         List<EnrollmentCertificateInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentCertificateInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setCertificateAttachment(files);
+            }
+        }
         return infos;
     }
 

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

@@ -7,6 +7,7 @@ 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.EnrollmentLanguageInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLanguageInfoMapper;
@@ -65,6 +66,13 @@ public class EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguag
             queryWrapper.eq("user_id", id);
         }
         List<EnrollmentLanguageInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentLanguageInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setFiles(files);
+            }
+        }
         return infos;
     }
 

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

@@ -29,7 +29,6 @@ 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;
 import com.taobao.api.ApiException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -40,7 +39,6 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 /**
  * @author 王强
@@ -882,13 +880,13 @@ 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);
-        }
+        //if (StringUtils.isBlank(reportData.getJoinIndustryDate())) {
+        //    reportData.setJoinIndustryDate(null);
+        //}
+        //reportData.getJoinWorkDate()
+        //if () {
+        //    reportData.setJoinWorkDate(null);
+        //}
 
         updateIdCard(reportData);
 

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

@@ -7,6 +7,7 @@ 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.EnrollmentLanguageInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentLanguageInfoMapper;
@@ -65,6 +66,13 @@ public class EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInf
             queryWrapper.eq("user_id", id);
         }
         List<EnrollmentRewardInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentRewardInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setFiles(files);
+            }
+        }
         return infos;
     }
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentSkillInfoService.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.EnrollmentRewardInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentCertificateInfoMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSkillInfoMapper;
@@ -65,6 +66,13 @@ public class EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoM
             queryWrapper.eq("user_id", id);
         }
         List<EnrollmentSkillInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentSkillInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setFiles(files);
+            }
+        }
         return infos;
     }
 

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

@@ -64,6 +64,13 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
             queryWrapper.eq("user_id", id);
         }
         List<EnrollmentTrainingInfo> infos = mapper.selectList(queryWrapper);
+        // 查询附件信息
+        for (EnrollmentTrainingInfo eduInfo : infos) {
+            List<WorkAttachmentInfoDTO> files = mapper.findDtos(eduInfo.getId());
+            if (CollectionUtils.isNotEmpty(files)) {
+                eduInfo.setFiles(files);
+            }
+        }
         return infos;
     }