面试日历修改

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

@@ -4,7 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
@@ -163,6 +165,10 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         for (DayInterviewVo dayInterviewVo : dayStudyVosOne) {
             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);
+                }
                 quantumVo.setRecruitInterviewList(recruitInterviewVos);
             }
         }

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

@@ -74,4 +74,15 @@ public class RecruitInterviewVo {
 	@ApiModelProperty("简历")
 	private RecruitResumeVo recruitResumeVo;
 
+	/** 面试用户名 */
+	@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,8 +39,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectByDay" parameterType="map" resultMap="RecruitInterviewVoResult">
-        select * from recruit_interview where 1=1
-            <if test="year!=null">
+        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}
             </if>
             <if test="month!=null">