diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java index c51cdf17..35011cc3 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesApplyMQDto.java @@ -51,6 +51,8 @@ public class EmployeesApplyMQDto implements Serializable { private String houseAddress; /**政治面貌*/ private String politicalAppearance; + /**签发机关*/ + private String issuingAuthority; /**紧急联系人*/ private String emergencyContact; /**紧急联系人电话*/ diff --git a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java index 259f1da4..1cbcb818 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/EmployeesStatusMQDto.java @@ -95,5 +95,12 @@ public class EmployeesStatusMQDto implements Serializable { private String noCrimeCertificate; /**现住址*/ private String currentAddress; - + /**有效开始日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date startTime; + /**有效结束日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy.MM.dd") + @DateTimeFormat(pattern="yyyy.MM.dd") + private Date endTime; } diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java index f533ced5..5e6e9a1f 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesapply/controller/EmployeesApplyController.java @@ -162,6 +162,8 @@ public class EmployeesApplyController extends JeecgController