diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
index c9ed0b12..67121aee 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -82,6 +82,10 @@ public class WmsEmployeeInfo extends BaseEntity {
* 紧急联系人电话
*/
private String emergencyContactPhone;
+ /**
+ * 社保类型(三险/五险)
+ */
+ private String socialInsuranceType;
/**
* 逻辑删除标识:0=正常,1=已删
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
index 5184504e..bb8f9d34 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java
@@ -94,6 +94,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
*/
private String emergencyContactPhone;
+ /**
+ * 社保类型(三险/五险)
+ */
+ private String socialInsuranceType;
+
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
index 7fb0e226..b5e33d7f 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java
@@ -112,6 +112,11 @@ public class WmsEmployeeInfoVo {
@ExcelProperty(value = "紧急联系人电话")
private String emergencyContactPhone;
+ /**
+ * 社保类型(三险/五险)
+ */
+ private String socialInsuranceType;
+
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
index e4ce1b87..37f51e06 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java
@@ -75,6 +75,7 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
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.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone());
+ lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
return lqw;
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
index 82f4c682..d1b8bb11 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -20,6 +20,7 @@
+