From ecc8b4f87525c8b44cb15891863a189142a271cb Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 15 Oct 2025 09:38:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=91=98=E5=B7=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E6=9C=9F=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/NuEmployeesAdvisoryInfoServiceImpl.java      |  2 ++
 .../src/main/java/com/nu/dto/EmployeesApplyMQDto.java |  4 ++++
 .../main/java/com/nu/entity/EmployeesApplyEntity.java | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
index 5b825ce..95ef6d4 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java
@@ -116,6 +116,8 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
         mqdto.setNoCrimeCertificate(dto.getNoCrimeCertificate());
         mqdto.setHouseAddress(dto.getIdCardAddress());
         mqdto.setEmployeeId(dto.getId());
+        mqdto.setStartTime(dto.getStartTime());
+        mqdto.setEndTime(dto.getEndTime());
         rabbitMQUtil.sendToExchange("hldy.employee", dto.getOrgCode() + ".employee.infoUpdate.audit", mqdto);
         return 1;
     }
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 419b6f9..1c33ce7 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
@@ -97,4 +97,8 @@ public class EmployeesApplyMQDto implements Serializable {
     private Date opeTime;
     /**修改状态 1修改申请中 2通过 3驳回 */
     private java.lang.String modifyStatus;
+    /**身份证有效开始日期 */
+    private Date startTime;
+    /**身份证有效结束日期 */
+    private Date endTime;
 }
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java
index e41bb3b..34e2397 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesApplyEntity.java
@@ -1,7 +1,9 @@
 package com.nu.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -99,4 +101,13 @@ public class EmployeesApplyEntity implements Serializable {
     private String orgCode;
 
     private Date opeTime;
+
+    /**有效开始日期*/
+    @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;
 }