change 4 роки тому
батько
коміт
a52ae03dd1

+ 1 - 1
zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitCompanyController.java

@@ -29,7 +29,7 @@ import java.util.List;
 /**
  * 公司管理列Controller
  * 
- * @author ruoyi
+ * @author change
  * @date 2021-08-12
  */
 @Api(value = "公司管理列控制器", tags = {"公司管理列管理"})

+ 100 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/recruit/RecruitResumeController.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import cn.hutool.poi.word.Word07Writer;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitResumeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitResumeService;
+import com.zhongzheng.modules.recruit.vo.RecruitResumeVo;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 招聘用户简历Controller
+ *
+ * @author change
+ * @date 2021-08-24
+ */
+@Api(value = "招聘用户简历控制器", tags = {"招聘用户简历管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/resume")
+public class RecruitResumeController extends BaseController {
+
+    private final IRecruitResumeService iRecruitResumeService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询招聘用户简历列表
+     */
+    @ApiOperation("查询招聘用户简历列表")
+    @PreAuthorize("@ss.hasPermi('recruit:resume:list')")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitResumeVo> list(RecruitResumeQueryBo bo) {
+        startPage();
+        List<RecruitResumeVo> list = iRecruitResumeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取招聘用户简历详细信息
+     */
+    @ApiOperation("获取招聘用户简历详细信息")
+    @PreAuthorize("@ss.hasPermi('recruit:resume:query')")
+    @GetMapping("/{resumeId}")
+    public AjaxResult<RecruitResumeVo> getInfo(@PathVariable("resumeId" ) Long resumeId) {
+        return AjaxResult.success(iRecruitResumeService.queryById(resumeId));
+    }
+
+    /**
+     * 新增招聘用户简历
+     */
+    @ApiOperation("新增招聘用户简历")
+    @Log(title = "招聘用户简历", businessType = BusinessType.INSERT)
+    @PreAuthorize("@ss.hasPermi('recruit:template:add')")
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitResumeAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iRecruitResumeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改招聘用户简历
+     */
+    @ApiOperation("修改招聘用户简历")
+    @Log(title = "招聘用户简历", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('system:template:edit')")
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitResumeEditBo bo) {
+        return toAjax(iRecruitResumeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -12,12 +12,16 @@ import java.util.Date;
  * 招聘面试关联添加对象 recruit_interview
  *
  * @author ruoyi
- * @date 2021-08-20
+ * @date 2021-08-24
  */
 @Data
 @ApiModel("招聘面试关联添加对象")
 public class RecruitInterviewAddBo {
 
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long resumeId;
     /** 年 */
     @ApiModelProperty("年")
     private Integer year;
@@ -54,11 +58,25 @@ public class RecruitInterviewAddBo {
     /** 面试用户id */
     @ApiModelProperty("面试用户id")
     private Long userId;
-    /** 1 在线简历投递  2 附件简历投递 */
-    @ApiModelProperty("1 在线简历投递  2 附件简历投递")
-    private Integer resumeStatus;
-
-    /** 面试简历ID */
-    @ApiModelProperty("面试简历ID")
-    private Long resumeId;
+    /** 附件简历 */
+    @ApiModelProperty("附件简历")
+    private String attachUrl;
+    /** 拒绝理由 */
+    @ApiModelProperty("拒绝理由")
+    private String refuse;
+    /** 面试时间 */
+    @ApiModelProperty("面试时间")
+    private Long resumeTime;
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+    /** 公司 */
+    @ApiModelProperty("公司")
+    private String companyName;
+    /** 转发邮箱 */
+    @ApiModelProperty("转发邮箱")
+    private String emall;
 }

+ 28 - 4
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-20
+ * @date 2021-08-24
  */
 @Data
 @ApiModel("招聘面试关联编辑对象")
@@ -66,7 +66,31 @@ public class RecruitInterviewEditBo {
     @ApiModelProperty("面试用户id")
     private Long userId;
 
-    /** 1 在线简历投递  2 附件简历投递 */
-    @ApiModelProperty("1 在线简历投递  2 附件简历投递")
-    private Integer resumeStatus;
+    /** 附件简历 */
+    @ApiModelProperty("附件简历")
+    private String attachUrl;
+
+    /** 拒绝理由 */
+    @ApiModelProperty("拒绝理由")
+    private String refuse;
+
+    /** 面试时间 */
+    @ApiModelProperty("面试时间")
+    private Long resumeTime;
+
+    /** 联系人 */
+    @ApiModelProperty("联系人")
+    private String linkMan;
+
+    /** 联系电话 */
+    @ApiModelProperty("联系电话")
+    private String linkTel;
+
+    /** 公司 */
+    @ApiModelProperty("公司")
+    private String companyName;
+
+    /** 转发邮箱 */
+    @ApiModelProperty("转发邮箱")
+    private String emall;
 }

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

@@ -16,7 +16,7 @@ import com.zhongzheng.common.core.domain.BaseEntity;
  * 招聘面试关联分页查询对象 recruit_interview
  *
  * @author ruoyi
- * @date 2021-08-20
+ * @date 2021-08-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -67,9 +67,27 @@ public class RecruitInterviewQueryBo extends BaseEntity {
 	/** 面试用户id */
 	@ApiModelProperty("面试用户id")
 	private Long userId;
-	/** 1 在线简历投递  2 附件简历投递 */
-	@ApiModelProperty("1 在线简历投递  2 附件简历投递")
-	private Integer resumeStatus;
+	/** 附件简历 */
+	@ApiModelProperty("附件简历")
+	private String attachUrl;
+	/** 拒绝理由 */
+	@ApiModelProperty("拒绝理由")
+	private String refuse;
+	/** 面试时间 */
+	@ApiModelProperty("面试时间")
+	private Long resumeTime;
+	/** 联系人 */
+	@ApiModelProperty("联系人")
+	private String linkMan;
+	/** 联系电话 */
+	@ApiModelProperty("联系电话")
+	private String linkTel;
+	/** 公司 */
+	@ApiModelProperty("公司")
+	private String companyName;
+	/** 转发邮箱 */
+	@ApiModelProperty("转发邮箱")
+	private String emall;
 
 	/** 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 转正")

+ 21 - 3
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-20
+ * @date 2021-08-24
  */
 @Data
 @NoArgsConstructor
@@ -66,7 +66,25 @@ private static final long serialVersionUID=1L;
     /** 面试用户id */
     private Long userId;
 
-    /** 1 在线简历投递  2 附件简历投递 */
-    private Integer resumeStatus;
+    /** 附件简历 */
+    private String attachUrl;
+
+    /** 拒绝理由 */
+    private String refuse;
+
+    /** 面试时间 */
+    private Long resumeTime;
+
+    /** 联系人 */
+    private String linkMan;
+
+    /** 联系电话 */
+    private String linkTel;
+
+    /** 公司 */
+    private String companyName;
+
+    /** 转发邮箱 */
+    private String emall;
 
 }

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

@@ -15,6 +15,7 @@ import com.zhongzheng.modules.recruit.domain.RecruitResume;
 import com.zhongzheng.modules.recruit.service.IRecruitNeedsService;
 import com.zhongzheng.modules.recruit.service.IRecruitResumeService;
 import com.zhongzheng.modules.recruit.vo.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -66,7 +67,13 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         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());
-        lqw.eq(bo.getResumeStatus() != null, RecruitInterview::getResumeStatus, bo.getResumeStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getAttachUrl()), RecruitInterview::getAttachUrl, bo.getAttachUrl());
+        lqw.eq(StrUtil.isNotBlank(bo.getRefuse()), RecruitInterview::getRefuse, bo.getRefuse());
+        lqw.eq(bo.getResumeTime() != null, RecruitInterview::getResumeTime, bo.getResumeTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getLinkMan()), RecruitInterview::getLinkMan, bo.getLinkMan());
+        lqw.eq(StrUtil.isNotBlank(bo.getLinkTel()), RecruitInterview::getLinkTel, bo.getLinkTel());
+        lqw.like(StrUtil.isNotBlank(bo.getCompanyName()), RecruitInterview::getCompanyName, bo.getCompanyName());
+        lqw.eq(StrUtil.isNotBlank(bo.getEmall()), RecruitInterview::getEmall, bo.getEmall());
         return entity2Vo(this.list(lqw));
     }
 
@@ -180,15 +187,9 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
                         Convert.toInt(dayInterviewVo.getDate()),bo.getMonth(), bo.getYear(), quantumVo.getTimingStart(), quantumVo.getTimingEnd(),
                         bo.getStatusIds());
                 for (RecruitInterviewVo recruitInterviewVo : recruitInterviewVos) {
-                    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);

+ 30 - 10
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-20
+ * @date 2021-08-24
  */
 @Data
 @ApiModel("招聘面试关联视图对象")
@@ -64,21 +64,12 @@ public class RecruitInterviewVo {
 	@Excel(name = "面试用户id")
 	@ApiModelProperty("面试用户id")
 	private Long userId;
-	/** 1 在线简历投递  2 附件简历投递 */
-	@Excel(name = "1 在线简历投递  2 附件简历投递")
-	@ApiModelProperty("1 在线简历投递  2 附件简历投递")
-	private Integer resumeStatus;
 
 	/** 简历 */
 	@Excel(name = "简历")
 	@ApiModelProperty("简历")
 	private RecruitResumeVo recruitResumeVo;
 
-	/** 附件简历 */
-	@Excel(name = "附件简历")
-	@ApiModelProperty("附件简历")
-	private RecruitAttachResumeVo RecruitAttachResumeVo;
-
 	/** 面试用户名 */
 	@Excel(name = "面试用户名")
 	@ApiModelProperty("面试用户名")
@@ -90,4 +81,33 @@ public class RecruitInterviewVo {
 	@ApiModelProperty("面试岗位")
 	private String job;
 
+	/** 附件简历 */
+	@Excel(name = "附件简历")
+	@ApiModelProperty("附件简历")
+	private String attachUrl;
+	/** 拒绝理由 */
+	@Excel(name = "拒绝理由")
+	@ApiModelProperty("拒绝理由")
+	private String refuse;
+	/** 面试时间 */
+	@Excel(name = "面试时间")
+	@ApiModelProperty("面试时间")
+	private Long resumeTime;
+	/** 联系人 */
+	@Excel(name = "联系人")
+	@ApiModelProperty("联系人")
+	private String linkMan;
+	/** 联系电话 */
+	@Excel(name = "联系电话")
+	@ApiModelProperty("联系电话")
+	private String linkTel;
+	/** 公司 */
+	@Excel(name = "公司")
+	@ApiModelProperty("公司")
+	private String companyName;
+	/** 转发邮箱 */
+	@Excel(name = "转发邮箱")
+	@ApiModelProperty("转发邮箱")
+	private String emall;
+
 }

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

@@ -18,14 +18,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="userId" column="user_id"/>
-        <result property="resumeStatus" column="resume_status"/>
+        <result property="attachUrl" column="attach_url"/>
+        <result property="refuse" column="refuse"/>
+        <result property="resumeTime" column="resume_time"/>
+        <result property="linkMan" column="link_man"/>
+        <result property="linkTel" column="link_tel"/>
+        <result property="companyName" column="company_name"/>
+        <result property="emall" column="emall"/>
     </resultMap>
 
     <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"/>
@@ -35,7 +39,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="userId" column="user_id"/>
-        <result property="resumeStatus" column="resume_status"/>
+        <result property="attachUrl" column="attach_url"/>
+        <result property="refuse" column="refuse"/>
+        <result property="resumeTime" column="resume_time"/>
+        <result property="linkMan" column="link_man"/>
+        <result property="linkTel" column="link_tel"/>
+        <result property="companyName" column="company_name"/>
+        <result property="emall" column="emall"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.recruit.vo.RecruitInterviewExcel" id="RecruitInterviewExcelResult">