fix 招聘模板

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

@@ -25,12 +25,12 @@ public class RecruitTemplateAddBo {
     /** 岗位 */
     @ApiModelProperty("岗位")
     private String job;
-    /** 月薪资起点 */
-    @ApiModelProperty("月薪资起点")
-    private BigDecimal monthIncomeStart;
-    /** 月薪资结点 */
-    @ApiModelProperty("月薪资结点")
-    private BigDecimal monthIncomeEnd;
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
     /** 工作职责 */
     @ApiModelProperty("工作职责")
     private String duty;
@@ -67,12 +67,6 @@ public class RecruitTemplateAddBo {
     /** 0 失效 1启用 */
     @ApiModelProperty("0 失效 1启用")
     private Integer status;
-    /** 年薪资起点 */
-    @ApiModelProperty("年薪资起点")
-    private BigDecimal yearIncomeStart;
-    /** 年薪资结点 */
-    @ApiModelProperty("年薪资结点")
-    private BigDecimal yearIncomeEnd;
     /** 1月薪 2年薪 */
     @ApiModelProperty("1月薪 2年薪")
     private Integer incomeType;

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

@@ -31,13 +31,13 @@ public class RecruitTemplateEditBo {
     @ApiModelProperty("岗位")
     private String job;
 
-    /** 月薪资起点 */
-    @ApiModelProperty("月薪资起点")
-    private BigDecimal monthIncomeStart;
+    /** 薪资起点 */
+    @ApiModelProperty("薪资起点")
+    private BigDecimal incomeStart;
 
-    /** 月薪资结点 */
-    @ApiModelProperty("月薪资结点")
-    private BigDecimal monthIncomeEnd;
+    /** 薪资结点 */
+    @ApiModelProperty("薪资结点")
+    private BigDecimal incomeEnd;
 
     /** 工作职责 */
     @ApiModelProperty("工作职责")
@@ -83,14 +83,6 @@ public class RecruitTemplateEditBo {
     @ApiModelProperty("0 失效 1启用")
     private Integer status;
 
-    /** 年薪资起点 */
-    @ApiModelProperty("年薪资起点")
-    private BigDecimal yearIncomeStart;
-
-    /** 年薪资结点 */
-    @ApiModelProperty("年薪资结点")
-    private BigDecimal yearIncomeEnd;
-
     /** 1月薪 2年薪 */
     @ApiModelProperty("1月薪 2年薪")
     private Integer incomeType;

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

@@ -43,12 +43,12 @@ public class RecruitTemplateQueryBo extends BaseEntity {
 	/** 岗位 */
 	@ApiModelProperty("岗位")
 	private String job;
-	/** 月薪资起点 */
-	@ApiModelProperty("月薪资起点")
-	private BigDecimal monthIncomeStart;
-	/** 月薪资结点 */
-	@ApiModelProperty("月薪资结点")
-	private BigDecimal monthIncomeEnd;
+	/** 薪资起点 */
+	@ApiModelProperty("薪资起点")
+	private BigDecimal incomeStart;
+	/** 薪资结点 */
+	@ApiModelProperty("薪资结点")
+	private BigDecimal incomeEnd;
 	/** 工作职责 */
 	@ApiModelProperty("工作职责")
 	private String duty;
@@ -79,12 +79,6 @@ public class RecruitTemplateQueryBo extends BaseEntity {
 	/** 0 失效 1启用 */
 	@ApiModelProperty("0 失效 1启用")
 	private Integer status;
-	/** 年薪资起点 */
-	@ApiModelProperty("年薪资起点")
-	private BigDecimal yearIncomeStart;
-	/** 年薪资结点 */
-	@ApiModelProperty("年薪资结点")
-	private BigDecimal yearIncomeEnd;
 	/** 1月薪 2年薪 */
 	@ApiModelProperty("1月薪 2年薪")
 	private Integer incomeType;

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

@@ -34,11 +34,11 @@ private static final long serialVersionUID=1L;
     /** 岗位 */
     private String job;
 
-    /** 月薪资起点 */
-    private BigDecimal monthIncomeStart;
+    /** 薪资起点 */
+    private BigDecimal incomeStart;
 
-    /** 月薪资结点 */
-    private BigDecimal monthIncomeEnd;
+    /** 薪资结点 */
+    private BigDecimal incomeEnd;
 
     /** 工作职责 */
     private String duty;
@@ -81,12 +81,6 @@ private static final long serialVersionUID=1L;
     /** 商户ID */
     private Long tenantId;
 
-    /** 年薪资起点 */
-    private BigDecimal yearIncomeStart;
-
-    /** 年薪资结点 */
-    private BigDecimal yearIncomeEnd;
-
     /** 1月薪 2年薪 */
     private Integer incomeType;
 

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

@@ -41,8 +41,8 @@ public class RecruitTemplateServiceImpl extends ServiceImpl<RecruitTemplateMappe
         LambdaQueryWrapper<RecruitTemplate> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getCompanyId() != null, RecruitTemplate::getCompanyId, bo.getCompanyId());
         lqw.eq(StrUtil.isNotBlank(bo.getJob()), RecruitTemplate::getJob, bo.getJob());
-        lqw.eq(bo.getMonthIncomeStart() != null, RecruitTemplate::getMonthIncomeStart, bo.getMonthIncomeStart());
-        lqw.eq(bo.getMonthIncomeEnd() != null, RecruitTemplate::getMonthIncomeEnd, bo.getMonthIncomeEnd());
+        lqw.eq(bo.getIncomeStart() != null, RecruitTemplate::getIncomeStart, bo.getIncomeStart());
+        lqw.eq(bo.getIncomeEnd() != null, RecruitTemplate::getIncomeEnd, bo.getIncomeEnd());
         lqw.eq(StrUtil.isNotBlank(bo.getDuty()), RecruitTemplate::getDuty, bo.getDuty());
         lqw.eq(StrUtil.isNotBlank(bo.getRequirement()), RecruitTemplate::getRequirement, bo.getRequirement());
         lqw.eq(StrUtil.isNotBlank(bo.getWelfare()), RecruitTemplate::getWelfare, bo.getWelfare());
@@ -53,8 +53,6 @@ public class RecruitTemplateServiceImpl extends ServiceImpl<RecruitTemplateMappe
         lqw.eq(StrUtil.isNotBlank(bo.getMinimumEduDict()), RecruitTemplate::getMinimumEduDict, bo.getMinimumEduDict());
         lqw.eq(StrUtil.isNotBlank(bo.getMajor()), RecruitTemplate::getMajor, bo.getMajor());
         lqw.eq(bo.getStatus() != null, RecruitTemplate::getStatus, bo.getStatus());
-        lqw.eq(bo.getYearIncomeStart() != null, RecruitTemplate::getYearIncomeStart, bo.getYearIncomeStart());
-        lqw.eq(bo.getYearIncomeEnd() != null, RecruitTemplate::getYearIncomeEnd, bo.getYearIncomeEnd());
         lqw.eq(bo.getIncomeType() != null, RecruitTemplate::getIncomeType, bo.getIncomeType());
         return entity2Vo(this.list(lqw));
     }

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

@@ -33,14 +33,14 @@ public class RecruitTemplateVo {
 	@Excel(name = "岗位")
 	@ApiModelProperty("岗位")
 	private String job;
-	/** 月薪资起点 */
-	@Excel(name = "月薪资起点")
-	@ApiModelProperty("月薪资起点")
-	private BigDecimal monthIncomeStart;
-	/** 月薪资结点 */
-	@Excel(name = "月薪资结点")
-	@ApiModelProperty("月薪资结点")
-	private BigDecimal monthIncomeEnd;
+	/** 薪资起点 */
+	@Excel(name = "薪资起点")
+	@ApiModelProperty("薪资起点")
+	private BigDecimal incomeStart;
+	/** 薪资结点 */
+	@Excel(name = "薪资结点")
+	@ApiModelProperty("薪资结点")
+	private BigDecimal incomeEnd;
 	/** 工作职责 */
 	@Excel(name = "工作职责")
 	@ApiModelProperty("工作职责")
@@ -81,14 +81,6 @@ public class RecruitTemplateVo {
 	@Excel(name = "0 失效 1启用")
 	@ApiModelProperty("0 失效 1启用")
 	private Integer status;
-	/** 年薪资起点 */
-	@Excel(name = "年薪资起点")
-	@ApiModelProperty("年薪资起点")
-	private BigDecimal yearIncomeStart;
-	/** 年薪资结点 */
-	@Excel(name = "年薪资结点")
-	@ApiModelProperty("年薪资结点")
-	private BigDecimal yearIncomeEnd;
 	/** 1月薪 2年薪 */
 	@Excel(name = "1月薪 2年薪")
 	@ApiModelProperty("1月薪 2年薪")

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

@@ -8,8 +8,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="id"/>
         <result property="companyId" column="company_id"/>
         <result property="job" column="job"/>
-        <result property="monthIncomeStart" column="month_income_start"/>
-        <result property="monthIncomeEnd" column="month_income_end"/>
+        <result property="incomeStart" column="income_start"/>
+        <result property="incomeEnd" column="income_end"/>
         <result property="duty" column="duty"/>
         <result property="requirement" column="requirement"/>
         <result property="welfare" column="welfare"/>
@@ -22,8 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="status" column="status"/>
-        <result property="yearIncomeStart" column="year_income_start"/>
-        <result property="yearIncomeEnd" column="year_income_end"/>
         <result property="incomeType" column="income_type"/>
     </resultMap>