Merge remote-tracking branch 'origin/dev' into dev

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

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateAddBo;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo;
+import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
 import com.zhongzheng.modules.recruit.service.IRecruitTemplateService;
 import com.zhongzheng.modules.recruit.vo.RecruitTemplateVo;
 import lombok.RequiredArgsConstructor;
@@ -48,9 +49,9 @@ public class RecruitTemplateController extends BaseController {
     @ApiOperation("查询招聘模板列表")
     @PreAuthorize("@ss.hasPermi('recruit:template:list')")
     @GetMapping("/list")
-    public TableDataInfo<RecruitTemplateVo> list(RecruitTemplateQueryBo bo) {
+    public TableDataInfo<RecruitTemplate> list(RecruitTemplateQueryBo bo) {
         startPage();
-        List<RecruitTemplateVo> list = iRecruitTemplateService.queryList(bo);
+        List<RecruitTemplate> list = iRecruitTemplateService.queryRecruitTemplateList(bo);
         return getDataTable(list);
     }
 

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

@@ -82,5 +82,8 @@ public class RecruitTemplateQueryBo extends BaseEntity {
 	/** 1月薪 2年薪 */
 	@ApiModelProperty("1月薪 2年薪")
 	private Integer incomeType;
+	/** 公司名 */
+	@ApiModelProperty("公司名")
+	private String companyName;
 
 }

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

@@ -84,4 +84,16 @@ private static final long serialVersionUID=1L;
     /** 1月薪 2年薪 */
     private Integer incomeType;
 
+    /** 最低学历文本 */
+    @TableField(exist = false)
+    private String minimumEduLabel;
+
+    /** 工作年限文本 */
+    @TableField(exist = false)
+    private String workingYearsLabel;
+
+    /** 公司名 */
+    @TableField(exist = false)
+    private String companyName;
+
 }

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

@@ -1,8 +1,11 @@
 package com.zhongzheng.modules.recruit.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo;
 import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
 
+import java.util.List;
+
 /**
  * 招聘模板Mapper接口
  *
@@ -11,4 +14,6 @@ import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
  */
 public interface RecruitTemplateMapper extends BaseMapper<RecruitTemplate> {
 
+    List<RecruitTemplate> queryRecruitTemplateList(RecruitTemplateQueryBo bo);
+
 }

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

@@ -28,6 +28,8 @@ public interface IRecruitTemplateService extends IService<RecruitTemplate> {
 	 */
 	List<RecruitTemplateVo> queryList(RecruitTemplateQueryBo bo);
 
+	List<RecruitTemplate> queryRecruitTemplateList(RecruitTemplateQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入招聘模板
 	 * @param bo 招聘模板新增业务对象

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

@@ -3,6 +3,7 @@ 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.order.mapper.OrderMapper;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateAddBo;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateEditBo;
 import com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo;
@@ -10,6 +11,7 @@ import com.zhongzheng.modules.recruit.domain.RecruitTemplate;
 import com.zhongzheng.modules.recruit.mapper.RecruitTemplateMapper;
 import com.zhongzheng.modules.recruit.service.IRecruitTemplateService;
 import com.zhongzheng.modules.recruit.vo.RecruitTemplateVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -30,6 +32,9 @@ import java.util.stream.Collectors;
 @Service
 public class RecruitTemplateServiceImpl extends ServiceImpl<RecruitTemplateMapper, RecruitTemplate> implements IRecruitTemplateService {
 
+    @Autowired
+    private RecruitTemplateMapper recruitTemplateMapper;
+
     @Override
     public RecruitTemplateVo queryById(Long id){
         RecruitTemplate db = this.baseMapper.selectById(id);
@@ -57,6 +62,11 @@ public class RecruitTemplateServiceImpl extends ServiceImpl<RecruitTemplateMappe
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<RecruitTemplate> queryRecruitTemplateList(RecruitTemplateQueryBo bo) {
+        return recruitTemplateMapper.queryRecruitTemplateList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -23,7 +23,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
         <result property="incomeType" column="income_type"/>
+        <result property="minimumEduLabel" column="minimum_edu_label"/>
+        <result property="workingYearsLabel" column="working_years_label"/>
+        <result property="companyName" column="company_name"/>
     </resultMap>
 
+    <select id="queryRecruitTemplateList" parameterType="com.zhongzheng.modules.recruit.bo.RecruitTemplateQueryBo"  resultMap="RecruitTemplateResult">
+        SELECT
+        rt.*,
+        dd.dict_label AS minimum_edu_label,
+        dd1.dict_label AS working_years_label,
+        vtc.company_name
+        FROM
+        recruit_template rt
+        LEFT JOIN sys_dict_data dd ON rt.minimum_edu_dict = dd.dict_code
+        LEFT JOIN sys_dict_data dd1 ON rt.working_years_dict = dd1.dict_code
+        LEFT JOIN v_tenant_company vtc ON rt.company_id = vtc.company_id
+        WHERE
+        1 = 1
+        <if test="job != null and job != ''">
+            AND rt.job like concat('%', #{job}, '%')
+        </if>
+        <if test="companyName != null and companyName != ''">
+            AND vtc.company_name like concat('%', #{companyName}, '%')
+        </if>
+        ORDER BY
+        rt.id DESC
+    </select>
 
 </mapper>