面试日历修改

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/service/impl/RecruitInterviewServiceImpl.java

@@ -167,8 +167,16 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
             for (QuantumVo quantumVo : dayInterviewVo.getQuantumList()) {
                 List<RecruitInterviewVo> recruitInterviewVos = baseMapper.selectByDay(Convert.toInt(dayInterviewVo.getDate()),bo.getMonth(), bo.getYear(), quantumVo.getTimingStart(), quantumVo.getTimingEnd());
                 for (RecruitInterviewVo recruitInterviewVo : recruitInterviewVos) {
-                    RecruitResumeVo recruitResumeVo = JSON.parseObject(recruitInterviewVo.getResumeJson(), new TypeReference<RecruitResumeVo>() {});
-                    recruitInterviewVo.setRecruitResumeVo(recruitResumeVo);
+                    if(recruitInterviewVo.getResumeStatus() == 1) {
+                        RecruitResumeVo recruitResumeVo = JSON.parseObject(recruitInterviewVo.getResumeJson(), new TypeReference<RecruitResumeVo>() {
+                        });
+                        recruitInterviewVo.setRecruitResumeVo(recruitResumeVo);
+                    }else {
+                        RecruitAttachResumeVo recruitAttachResumeVo = JSON.parseObject(recruitInterviewVo.getResumeJson(), new TypeReference<RecruitAttachResumeVo>() {
+                        });
+                        recruitInterviewVo.setRecruitAttachResumeVo(recruitAttachResumeVo);
+                    }
+
                 }
                 quantumVo.setRecruitInterviewList(recruitInterviewVos);
             }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/QuantumVo.java

@@ -28,4 +28,8 @@ public class QuantumVo {
     @ApiModelProperty("面试人信息")
     private List<RecruitInterviewVo> recruitInterviewList;
 
+    /** 面试人信息 */
+    @ApiModelProperty("面试人信息(附件简历)")
+    private List<RecruitAttachResumeVo> recruitAttachResumeVos;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/vo/RecruitInterviewVo.java

@@ -69,9 +69,25 @@ public class RecruitInterviewVo {
 	@ApiModelProperty("1 在线简历投递  2 附件简历投递")
 	private Integer resumeStatus;
 
-	/** 1 在线简历投递  2 附件简历投递 */
+	/** 简历 */
 	@Excel(name = "简历")
 	@ApiModelProperty("简历")
 	private RecruitResumeVo recruitResumeVo;
 
+	/** 附件简历 */
+	@Excel(name = "附件简历")
+	@ApiModelProperty("附件简历")
+	private RecruitAttachResumeVo RecruitAttachResumeVo;
+
+	/** 面试用户名 */
+	@Excel(name = "面试用户名")
+	@ApiModelProperty("面试用户名")
+	private String realName;
+
+
+	/** 面试岗位 */
+	@Excel(name = "面试岗位")
+	@ApiModelProperty("面试岗位")
+	private String job;
+
 }

zhongzheng-system/src/main/resources/mapper/modules/recruit/RecruitInterviewMapper.xml

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitInterviewVo" id="RecruitInterviewVoResult">
         <result property="interviewId" column="interview_id"/>
         <result property="year" column="year"/>
+        <result property="realName" column="realname"/>
+        <result property="job" column="job"/>
         <result property="month" column="month"/>
         <result property="day" column="day"/>
         <result property="timingStart" column="timing_start"/>
@@ -37,7 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByDay" parameterType="map" resultMap="RecruitInterviewVoResult">
-        select * from recruit_interview
+        select r.*,u.realname,n.job from recruit_interview r
+            LEFT JOIN `user` u on r.user_id = u.user_id
+            LEFT JOIN recruit_needs n on n.id = r.needs_id
         where 1=1
         <if test="year!=null">
                 and year=#{year}