refactor(perf): 将员工绩效薪资信息整合到WMS员工模块中
- 删除独立的员工绩效薪资信息相关文件(接口、实体类、业务对象、控制器、映射器) - 在WMS员工信息实体中新增底薪、岗位绩效基数和岗位系数字段 - 在WMS员工信息业务对象中添加对应的薪资相关属性 - 更新数据库映射文件,增加薪资字段的映射关系 - 修改WMS员工服务实现,添加对新增薪资字段的查询条件支持 - 在WMS员工信息视图对象中增加薪资相关字段并配置Excel导出属性
This commit is contained in:
@@ -6,6 +6,7 @@ import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
|
||||
/**
|
||||
@@ -86,6 +87,18 @@ public class WmsEmployeeInfo extends BaseEntity {
|
||||
* 社保类型(三险/五险)
|
||||
*/
|
||||
private String socialInsuranceType;
|
||||
/**
|
||||
* 底薪(元)
|
||||
*/
|
||||
private BigDecimal baseSalary;
|
||||
/**
|
||||
* 岗位绩效基数(元), 默认≈底薪×20%
|
||||
*/
|
||||
private BigDecimal perfBase;
|
||||
/**
|
||||
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
|
||||
*/
|
||||
private BigDecimal posCoeffDefault;
|
||||
/**
|
||||
* 逻辑删除标识:0=正常,1=已删
|
||||
*/
|
||||
|
||||
@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
@@ -114,6 +115,21 @@ public class WmsEmployeeInfoBo extends BaseEntity {
|
||||
*/
|
||||
private String socialInsuranceType;
|
||||
|
||||
/**
|
||||
* 底薪(元)
|
||||
*/
|
||||
private BigDecimal baseSalary;
|
||||
|
||||
/**
|
||||
* 岗位绩效基数(元), 默认≈底薪×20%
|
||||
*/
|
||||
private BigDecimal perfBase;
|
||||
|
||||
/**
|
||||
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
|
||||
*/
|
||||
private BigDecimal posCoeffDefault;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@@ -117,6 +118,24 @@ public class WmsEmployeeInfoVo {
|
||||
*/
|
||||
private String socialInsuranceType;
|
||||
|
||||
/**
|
||||
* 底薪(元)
|
||||
*/
|
||||
@ExcelProperty(value = "底薪(元)")
|
||||
private BigDecimal baseSalary;
|
||||
|
||||
/**
|
||||
* 岗位绩效基数(元), 默认≈底薪×20%
|
||||
*/
|
||||
@ExcelProperty(value = "岗位绩效基数(元)")
|
||||
private BigDecimal perfBase;
|
||||
|
||||
/**
|
||||
* 默认岗位系数(初始值,后续月度由绩效自动覆盖)
|
||||
*/
|
||||
@ExcelProperty(value = "默认岗位系数")
|
||||
private BigDecimal posCoeffDefault;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
@@ -81,6 +81,9 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
|
||||
lqw.eq(bo.getBaseSalary() != null, WmsEmployeeInfo::getBaseSalary, bo.getBaseSalary());
|
||||
lqw.eq(bo.getPerfBase() != null, WmsEmployeeInfo::getPerfBase, bo.getPerfBase());
|
||||
lqw.eq(bo.getPosCoeffDefault() != null, WmsEmployeeInfo::getPosCoeffDefault, bo.getPosCoeffDefault());
|
||||
// 是否离职
|
||||
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
|
||||
// 离职时间范围查询
|
||||
|
||||
@@ -21,6 +21,9 @@
|
||||
<result property="relationship" column="relationship"/>
|
||||
<result property="emergencyContactPhone" column="emergency_contact_phone"/>
|
||||
<result property="socialInsuranceType" column="social_insurance_type"/>
|
||||
<result property="baseSalary" column="base_salary"/>
|
||||
<result property="perfBase" column="perf_base"/>
|
||||
<result property="posCoeffDefault" column="pos_coeff_default"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
|
||||
Reference in New Issue
Block a user