fix 简历附件

zhongzheng-api/src/main/java/com/zhongzheng/controller/recruit/RecruitAttachResumeController.java

@@ -0,0 +1,95 @@
+package com.zhongzheng.controller.recruit;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeQueryBo;
+import com.zhongzheng.modules.recruit.service.IRecruitAttachResumeService;
+import com.zhongzheng.modules.recruit.vo.RecruitAttachResumeVo;
+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 hjl
+ * @date 2021-08-20
+ */
+@Api(value = "附件简历控制器", tags = {"附件简历管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/recruit/attach")
+public class RecruitAttachResumeController extends BaseController {
+
+    private final IRecruitAttachResumeService iRecruitAttachResumeService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询附件简历列表
+     */
+    @ApiOperation("查询附件简历列表")
+    @GetMapping("/list")
+    public TableDataInfo<RecruitAttachResumeVo> list(RecruitAttachResumeQueryBo bo) {
+        startPage();
+        List<RecruitAttachResumeVo> list = iRecruitAttachResumeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取附件简历详细信息
+     */
+    @ApiOperation("获取附件简历详细信息")
+    @GetMapping("/{attachResumeId}")
+    public AjaxResult<RecruitAttachResumeVo> getInfo(@PathVariable("attachResumeId" ) Long attachResumeId) {
+        return AjaxResult.success(iRecruitAttachResumeService.queryById(attachResumeId));
+    }
+
+    /**
+     * 新增附件简历
+     */
+    @ApiOperation("新增附件简历")
+    @Log(title = "附件简历", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody RecruitAttachResumeAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iRecruitAttachResumeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改附件简历
+     */
+    @ApiOperation("修改附件简历")
+    @Log(title = "附件简历", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@RequestBody RecruitAttachResumeEditBo bo) {
+        return toAjax(iRecruitAttachResumeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

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

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 附件简历添加对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@ApiModel("附件简历添加对象")
+public class RecruitAttachResumeAddBo {
+
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+    /** 附件简历名称 */
+    @ApiModelProperty("附件简历名称")
+    private String attachName;
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String attachUrl;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 1正常 -1删除 */
+    @ApiModelProperty("1正常 -1删除")
+    private Integer status;
+}

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

@@ -0,0 +1,41 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 附件简历编辑对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@ApiModel("附件简历编辑对象")
+public class RecruitAttachResumeEditBo {
+
+
+    /** 附件简历ID */
+    @ApiModelProperty("附件简历ID")
+    private Long attachResumeId;
+
+
+    /** 附件简历名称 */
+    @ApiModelProperty("附件简历名称")
+    private String attachName;
+
+    /** 地址 */
+    @ApiModelProperty("地址")
+    private String attachUrl;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+    /** 1正常 -1删除 */
+    @ApiModelProperty("1正常 -1删除")
+    private Integer status;
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.recruit.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 附件简历分页查询对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("附件简历分页查询对象")
+public class RecruitAttachResumeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 附件简历名称 */
+	@ApiModelProperty("附件简历名称")
+	private String attachName;
+	/** 地址 */
+	@ApiModelProperty("地址")
+	private String attachUrl;
+	/** 1正常 -1删除 */
+	@ApiModelProperty("1正常 -1删除")
+	private Integer status;
+
+}

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

@@ -22,9 +22,6 @@ public class RecruitResumeEditBo {
     @ApiModelProperty("面试简历ID")
     private Long resumeId;
 
-    /** 用户ID */
-    @ApiModelProperty("用户ID")
-    private Long userId;
 
     /** 用户真名 */
     @ApiModelProperty("用户真名")

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

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.recruit.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 附件简历对象 recruit_attach_resume
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("recruit_attach_resume")
+public class RecruitAttachResume implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 附件简历ID */
+    @TableId(value = "attach_resume_id")
+    private Long attachResumeId;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 附件简历名称 */
+    private String attachName;
+
+    /** 地址 */
+    private String attachUrl;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+    /** 1正常 -1删除 */
+    private Integer status;
+
+}

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

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.recruit.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.domain.RecruitAttachResume;
+
+/**
+ * 附件简历Mapper接口
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+public interface RecruitAttachResumeMapper extends BaseMapper<RecruitAttachResume> {
+
+}

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

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.recruit.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitAttachResume;
+import com.zhongzheng.modules.recruit.vo.RecruitAttachResumeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 附件简历Service接口
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+public interface IRecruitAttachResumeService extends IService<RecruitAttachResume> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	RecruitAttachResumeVo queryById(Long attachResumeId);
+
+	/**
+	 * 查询列表
+	 */
+	List<RecruitAttachResumeVo> queryList(RecruitAttachResumeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入附件简历
+	 * @param bo 附件简历新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(RecruitAttachResumeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改附件简历
+	 * @param bo 附件简历编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(RecruitAttachResumeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,102 @@
+package com.zhongzheng.modules.recruit.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeAddBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeEditBo;
+import com.zhongzheng.modules.recruit.bo.RecruitAttachResumeQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitAttachResume;
+import com.zhongzheng.modules.recruit.mapper.RecruitAttachResumeMapper;
+import com.zhongzheng.modules.recruit.service.IRecruitAttachResumeService;
+import com.zhongzheng.modules.recruit.vo.RecruitAttachResumeVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 附件简历Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Service
+public class RecruitAttachResumeServiceImpl extends ServiceImpl<RecruitAttachResumeMapper, RecruitAttachResume> implements IRecruitAttachResumeService {
+
+    @Override
+    public RecruitAttachResumeVo queryById(Long attachResumeId){
+        RecruitAttachResume db = this.baseMapper.selectById(attachResumeId);
+        return BeanUtil.toBean(db, RecruitAttachResumeVo.class);
+    }
+
+    @Override
+    public List<RecruitAttachResumeVo> queryList(RecruitAttachResumeQueryBo bo) {
+        LambdaQueryWrapper<RecruitAttachResume> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, RecruitAttachResume::getUserId, bo.getUserId());
+        lqw.like(StrUtil.isNotBlank(bo.getAttachName()), RecruitAttachResume::getAttachName, bo.getAttachName());
+        lqw.eq(StrUtil.isNotBlank(bo.getAttachUrl()), RecruitAttachResume::getAttachUrl, bo.getAttachUrl());
+        lqw.eq(bo.getStatus() != null, RecruitAttachResume::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<RecruitAttachResumeVo> entity2Vo(Collection<RecruitAttachResume> collection) {
+        List<RecruitAttachResumeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, RecruitAttachResumeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<RecruitAttachResume> page = (Page<RecruitAttachResume>)collection;
+            Page<RecruitAttachResumeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(RecruitAttachResumeAddBo bo) {
+        RecruitAttachResume add = BeanUtil.toBean(bo, RecruitAttachResume.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(RecruitAttachResumeEditBo bo) {
+        RecruitAttachResume update = BeanUtil.toBean(bo, RecruitAttachResume.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(RecruitAttachResume entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

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

@@ -92,7 +92,7 @@ public class RecruitInterviewServiceImpl extends ServiceImpl<RecruitInterviewMap
         validEntityBeforeSave(add);
         RecruitResumeVo recruitResumeVo = iRecruitResumeService.queryById(bo.getResumeId());
         if(checkDelivery(add)){
-            throw new CustomException("你已投递该岗位");
+            throw new CustomException("你已投递过该岗位");
         }
         if(recruitResumeVo==null){
             throw new CustomException("简历不存在");

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

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.recruit.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 附件简历视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-08-20
+ */
+@Data
+@ApiModel("附件简历视图对象")
+public class RecruitAttachResumeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 附件简历ID */
+	@ApiModelProperty("附件简历ID")
+	private Long attachResumeId;
+
+	/** 用户ID */
+	@Excel(name = "用户ID")
+	@ApiModelProperty("用户ID")
+	private Long userId;
+	/** 附件简历名称 */
+	@Excel(name = "附件简历名称")
+	@ApiModelProperty("附件简历名称")
+	private String attachName;
+	/** 地址 */
+	@Excel(name = "地址")
+	@ApiModelProperty("地址")
+	private String attachUrl;
+	/** 1正常 -1删除 */
+	@Excel(name = "1正常 -1删除")
+	@ApiModelProperty("1正常 -1删除")
+	private Integer status;
+
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.recruit.mapper.RecruitAttachResumeMapper">
+
+    <resultMap type="com.zhongzheng.modules.recruit.domain.RecruitAttachResume" id="RecruitAttachResumeResult">
+        <result property="attachResumeId" column="attach_resume_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="attachName" column="attach_name"/>
+        <result property="attachUrl" column="attach_url"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>