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 cc5f7959..82139702 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java
@@ -98,4 +98,11 @@ public class WmsEmployeeInfo extends BaseEntity {
// 是否离职
private Integer isLeave;
+
+ // 是否转正:0=未转正,1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 9cad8870..84b10c35 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
@@ -108,5 +108,11 @@ public class WmsEmployeeInfoBo extends BaseEntity {
// 是否离职
private Integer isLeave;
+ // 是否转正:0=未转正,1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 4e738126..bc5896f6 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
@@ -126,4 +126,11 @@ public class WmsEmployeeInfoVo {
// 是否离职
private Integer isLeave;
+
+ // 是否转正:0=未转正,1=已转正
+ private Integer isRegular;
+
+ // 转正时间
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date regularTime;
}
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 ba85df83..3c5f1c9c 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
@@ -78,6 +78,8 @@ public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService {
lqw.eq(StringUtils.isNotBlank(bo.getSocialInsuranceType()), WmsEmployeeInfo::getSocialInsuranceType, bo.getSocialInsuranceType());
// 是否离职
lqw.eq(bo.getIsLeave() != null, WmsEmployeeInfo::getIsLeave, bo.getIsLeave());
+ // 是否转正
+ lqw.eq(bo.getIsRegular() != null, WmsEmployeeInfo::getIsRegular, bo.getIsRegular());
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 f8ea5420..3af9502c 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml
@@ -28,6 +28,8 @@
+
+