feat(employee): 添加员工社保类型字段
- 在 WmsEmployeeInfo 实体类中新增 socialInsuranceType 字段 - 在 WmsEmployeeInfoBo 业务对象中新增 socialInsuranceType 字段 - 在 WmsEmployeeInfoVo 视图对象中新增 socialInsuranceType 字段 - 在 MyBatis 映射文件中添加社保类型字段映射配置 - 在查询条件构建器中添加社保类型筛选条件
This commit is contained in:
@@ -82,6 +82,10 @@ public class WmsEmployeeInfo extends BaseEntity {
|
|||||||
* 紧急联系人电话
|
* 紧急联系人电话
|
||||||
*/
|
*/
|
||||||
private String emergencyContactPhone;
|
private String emergencyContactPhone;
|
||||||
|
/**
|
||||||
|
* 社保类型(三险/五险)
|
||||||
|
*/
|
||||||
|
private String socialInsuranceType;
|
||||||
/**
|
/**
|
||||||
* 逻辑删除标识:0=正常,1=已删
|
* 逻辑删除标识:0=正常,1=已删
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String emergencyContactPhone;
|
private String emergencyContactPhone;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 社保类型(三险/五险)
|
||||||
|
*/
|
||||||
|
private String socialInsuranceType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -112,6 +112,11 @@ public class WmsEmployeeInfoVo {
|
|||||||
@ExcelProperty(value = "紧急联系人电话")
|
@ExcelProperty(value = "紧急联系人电话")
|
||||||
private String emergencyContactPhone;
|
private String emergencyContactPhone;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 社保类型(三险/五险)
|
||||||
|
*/
|
||||||
|
private String socialInsuranceType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -75,6 +75,7 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
|
|||||||
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact());
|
lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship());
|
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.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
<result property="emergencyContact" column="emergency_contact"/>
|
<result property="emergencyContact" column="emergency_contact"/>
|
||||||
<result property="relationship" column="relationship"/>
|
<result property="relationship" column="relationship"/>
|
||||||
<result property="emergencyContactPhone" column="emergency_contact_phone"/>
|
<result property="emergencyContactPhone" column="emergency_contact_phone"/>
|
||||||
|
<result property="socialInsuranceType" column="social_insurance_type"/>
|
||||||
<result property="createBy" column="create_by"/>
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by"/>
|
<result property="updateBy" column="update_by"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user