修改企业

zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitInterviewController.java

@@ -38,7 +38,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "招聘面试关联控制器", tags = {"招聘面试关联管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/modules.recruit/interview")
+@RequestMapping("/recruit/interview")
 public class RecruitInterviewController extends BaseController {
 
     private final IRecruitInterviewService iRecruitInterviewService;

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewAddBo.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 招聘面试关联添加对象 recruit_interview
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Data
 @ApiModel("招聘面试关联添加对象")
@@ -23,7 +23,7 @@ public class RecruitInterviewAddBo {
     private Integer year;
     /** 月 */
     @ApiModelProperty("月")
-    private Integer moth;
+    private Integer month;
     /** 日 */
     @ApiModelProperty("日")
     private Integer day;
@@ -36,16 +36,22 @@ public class RecruitInterviewAddBo {
     /** 面试需求岗位ID */
     @ApiModelProperty("面试需求岗位ID")
     private Long needsId;
-    /** 面试简历ID */
-    @ApiModelProperty("面试简历ID")
-    private Long resumeId;
+    /** 面试简历json */
+    @ApiModelProperty("面试简历json")
+    private String resumeJson;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long createTime;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
-    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
-    @ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    /** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
     private Integer status;
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+    /** 面试用户id */
+    @ApiModelProperty("面试用户id")
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewEditBo.java

@@ -11,7 +11,7 @@ import java.util.Date;
  * 招聘面试关联编辑对象 recruit_interview
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Data
 @ApiModel("招聘面试关联编辑对象")
@@ -28,7 +28,7 @@ public class RecruitInterviewEditBo {
 
     /** 月 */
     @ApiModelProperty("月")
-    private Integer moth;
+    private Integer month;
 
     /** 日 */
     @ApiModelProperty("日")
@@ -46,15 +46,23 @@ public class RecruitInterviewEditBo {
     @ApiModelProperty("面试需求岗位ID")
     private Long needsId;
 
-    /** 面试简历ID */
-    @ApiModelProperty("面试简历ID")
-    private Long resumeId;
+    /** 面试简历json */
+    @ApiModelProperty("面试简历json")
+    private String resumeJson;
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
 
-    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
-    @ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+    /** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    @ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
     private Integer status;
+
+    /** 商户ID */
+    @ApiModelProperty("商户ID")
+    private Long tenantId;
+
+    /** 面试用户id */
+    @ApiModelProperty("面试用户id")
+    private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/bo/RecruitInterviewQueryBo.java

@@ -15,7 +15,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 招聘面试关联分页查询对象 recruit_interview
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -41,7 +41,7 @@ public class RecruitInterviewQueryBo extends BaseEntity {
 	private Integer year;
 	/** 月 */
 	@ApiModelProperty("月")
-	private Integer moth;
+	private Integer month;
 	/** 日 */
 	@ApiModelProperty("日")
 	private Integer day;
@@ -54,11 +54,17 @@ public class RecruitInterviewQueryBo extends BaseEntity {
 	/** 面试需求岗位ID */
 	@ApiModelProperty("面试需求岗位ID")
 	private Long needsId;
-	/** 面试简历ID */
-	@ApiModelProperty("面试简历ID")
-	private Long resumeId;
-	/** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
-	@ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	/** 面试简历json */
+	@ApiModelProperty("面试简历json")
+	private String resumeJson;
+	/** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
 	private Integer status;
+	/** 商户ID */
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+	/** 面试用户id */
+	@ApiModelProperty("面试用户id")
+	private Long userId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/domain/RecruitInterview.java

@@ -13,7 +13,7 @@ import com.zhongzheng.common.annotation.Excel;
  * 招聘面试关联对象 recruit_interview
  * 
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Data
 @NoArgsConstructor
@@ -46,8 +46,8 @@ private static final long serialVersionUID=1L;
     /** 面试需求岗位ID */
     private Long needsId;
 
-    /** 面试简历ID */
-    private Long resumeId;
+    /** 面试简历json */
+    private String resumeJson;
 
     /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT)
@@ -57,7 +57,13 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
-    /** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+    /** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
     private Integer status;
 
+    /** 商户ID */
+    private Long tenantId;
+
+    /** 面试用户id */
+    private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/recruit/mapper/RecruitInterviewMapper.java

@@ -2,13 +2,18 @@ package com.zhongzheng.modules.recruit.mapper;
 
 import com.zhongzheng.modules.recruit.domain.RecruitInterview;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.vo.RecruitInterviewVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 招聘面试关联Mapper接口
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 public interface RecruitInterviewMapper extends BaseMapper<RecruitInterview> {
 
+    List<RecruitInterviewVo> selectByDay(@Param("day") Long date,@Param("month") Integer moth,@Param("year") Integer year);
 }

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

@@ -6,8 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.recruit.vo.CalendarInterviewVo;
 import com.zhongzheng.modules.recruit.vo.DayInterviewVo;
-import com.zhongzheng.modules.user.vo.CalendarStudyVo;
-import com.zhongzheng.modules.user.vo.DayStudyVo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,7 +28,7 @@ import java.util.stream.Collectors;
  * 招聘面试关联Service业务层处理
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Service
 public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMapper, RecruitInterview> implements IRecruitInterviewService {
@@ -50,8 +48,10 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         lqw.eq(StrUtil.isNotBlank(bo.getTimingStart()), RecruitInterview::getTimingStart, bo.getTimingStart());
         lqw.eq(StrUtil.isNotBlank(bo.getTimingEnd()), RecruitInterview::getTimingEnd, bo.getTimingEnd());
         lqw.eq(bo.getNeedsId() != null, RecruitInterview::getNeedsId, bo.getNeedsId());
-        lqw.eq(bo.getResumeId() != null, RecruitInterview::getResumeId, bo.getResumeId());
+        lqw.eq(StrUtil.isNotBlank(bo.getResumeJson()), RecruitInterview::getResumeJson, bo.getResumeJson());
         lqw.eq(bo.getStatus() != null, RecruitInterview::getStatus, bo.getStatus());
+        lqw.eq(bo.getTenantId() != null, RecruitInterview::getTenantId, bo.getTenantId());
+        lqw.eq(bo.getUserId() != null, RecruitInterview::getUserId, bo.getUserId());
         return entity2Vo(this.list(lqw));
     }
 
@@ -114,11 +114,18 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         Calendar cal = Calendar.getInstance();
         CalendarInterviewVo calendarInterviewVo = new CalendarInterviewVo();
         //得到日历日期
-        Long firstDayOfMonth = getFirstDayOfMonth(cal.get(Calendar.MONTH)+1);
-        Long lastDayOfMonth = getLastDayOfMonth(cal.get(Calendar.MONTH)+1);
+        if (bo.getMoth() == null){
+            bo.setMoth(cal.get(Calendar.MONTH)+1);
+        }
+        Long firstDayOfMonth = getFirstDayOfMonth(bo.getMoth());
+        Long lastDayOfMonth = getLastDayOfMonth(bo.getMoth());
         List<DayInterviewVo> dayStudyVosOne = getDays(firstDayOfMonth,lastDayOfMonth);
+        for (DayInterviewVo dayInterviewVo : dayStudyVosOne) {
+            List<RecruitInterviewVo> recruitInterviewVos=baseMapper.selectByDay(dayInterviewVo.getDate(),bo.getMoth(),bo.getYear());
+            dayInterviewVo.setRecruitInterviewList(recruitInterviewVos);
+        }
         calendarInterviewVo.setYear(Convert.toLong(cal.get(Calendar.YEAR)));
-        calendarInterviewVo.setMonth(Convert.toLong(cal.get(Calendar.MONTH)+1));
+        calendarInterviewVo.setMonth(Convert.toLong(bo.getMoth()));
         calendarInterviewVo.setDayInterviewVos(dayStudyVosOne);
         return calendarInterviewVo;
     }

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * 招聘面试关联视图对象 mall_package
  *
  * @author ruoyi
- * @date 2021-08-18
+ * @date 2021-08-20
  */
 @Data
 @ApiModel("招聘面试关联视图对象")
@@ -48,13 +48,21 @@ public class RecruitInterviewVo {
 	@Excel(name = "面试需求岗位ID")
 	@ApiModelProperty("面试需求岗位ID")
 	private Long needsId;
-	/** 面试简历ID */
-	@Excel(name = "面试简历ID")
-	@ApiModelProperty("面试简历ID")
-	private Long resumeId;
-	/** 1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
-	@Excel(name = "1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
-	@ApiModelProperty("1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	/** 面试简历json */
+	@Excel(name = "面试简历json")
+	@ApiModelProperty("面试简历json")
+	private String resumeJson;
+	/** 0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正 */
+	@Excel(name = "0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
+	@ApiModelProperty("0已投递  1 已发邀请  2已确定 3 已谢绝 4初试通过 5初试不通过 6复试通过 7复试不通过 8已发offer 9爽约 10 淘汰  11放弃  12 转正")
 	private Integer status;
+	/** 商户ID */
+	@Excel(name = "商户ID")
+	@ApiModelProperty("商户ID")
+	private Long tenantId;
+	/** 面试用户id */
+	@Excel(name = "面试用户id")
+	@ApiModelProperty("面试用户id")
+	private Long userId;
 
 }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.RecruitInterviewMapper">
+<mapper namespace="com.zhongzheng.modules.recruit.mapper.RecruitInterviewMapper">
 
     <resultMap type="com.zhongzheng.modules.recruit.domain.RecruitInterview" id="RecruitInterviewResult">
         <result property="interviewId" column="interview_id"/>
@@ -12,11 +12,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="timingStart" column="timing_start"/>
         <result property="timingEnd" column="timing_end"/>
         <result property="needsId" column="needs_id"/>
-        <result property="resumeId" column="resume_id"/>
+        <result property="resumeJson" column="resume_json"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="userId" column="user_id"/>
     </resultMap>
 
 
+    <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitInterviewVo" id="RecruitInterviewResult">
+        <result property="interviewId" column="interview_id"/>
+        <result property="year" column="year"/>
+        <result property="moth" column="moth"/>
+        <result property="day" column="day"/>
+        <result property="timingStart" column="timing_start"/>
+        <result property="timingEnd" column="timing_end"/>
+        <result property="needsId" column="needs_id"/>
+        <result property="resumeJson" column="resume_json"/>
+        <result property="status" column="status"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="userId" column="user_id"/>
+    </resultMap>
+
+    <select id="selectByDay" parameterType="map" resultMap="RecruitInterviewResult">
+
+    </select>
 </mapper>