From f69418ca1dbdbae5352ccb4fde40bc75d297ff7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 10 Feb 2026 13:51:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java  | 4 ++++
 .../employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml    | 2 +-
 .../service/impl/NuEmployeesAdvisoryInfoServiceImpl.java      | 1 +
 .../main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java  | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java
index 198ffae..d425c70 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/entity/NuEmployeesAdvisoryInfo.java
@@ -281,6 +281,10 @@ public class NuEmployeesAdvisoryInfo implements Serializable {
     @TableField(exist = false)
     private String modifyState;
 
+    //信息修改状态 空：没提交过修改 1修改申请中 2通过 3驳回*/
+    @TableField(exist = false)
+    private String applyStatus;
+
     @TableField(exist = false)
     private String auditContent;
 
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
index 9a1b488..5797159 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/NuEmployeesAdvisoryInfoMapper.xml
@@ -45,7 +45,7 @@
     <select id="queryEmployeeInfo" resultType="com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo">
         SELECT
         adinfo.*,
-        eo.modify_status AS modifyState,
+        eo.modify_status AS applyStatus,
         eo.audit_content AS auditContent
         FROM nu_biz_employees_advisory_info adinfo
         LEFT JOIN nu_biz_employees_org eo
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 fb754a8..25de0cf 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
@@ -131,6 +131,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl<NuEmployeesA
                 .map(item -> {
                     EmployeesAdvisoryInfoEntity entity = new EmployeesAdvisoryInfoEntity();
                     BeanUtils.copyProperties(item, entity);
+
                     return entity;
                 })
                 .collect(Collectors.toList());
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java
index c3dfcef..2c0c0e0 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/EmployeesAdvisoryInfoEntity.java
@@ -127,6 +127,9 @@ public class EmployeesAdvisoryInfoEntity implements Serializable {
     //信息修改状态 空：没提交过修改 1修改申请中 2通过 3驳回*/
     private String modifyState;
 
+    //信息修改状态 空：没提交过修改 1修改申请中 2通过 3驳回*/
+    private String applyStatus;
+
     private String auditContent;
     /**
      * 现住址