From 70409bf0d1bef6876916faf6a4ce24f3e797ec32 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 22 十月 2026 14:19:31 +0800
Subject: [PATCH] fix(人力): 在职员工台账默认不再按合同到期日过滤(可显示全部在职员工);入职同步写入入职日期;修复离职状态过滤失效

---
 src/main/resources/mapper/staff/StaffOnJobMapper.xml                            |    4 ++--
 src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java |   11 ++++++++++-
 doc/sql/rlzyxt_staff_ddl.sql                                                    |   16 ++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/doc/sql/rlzyxt_staff_ddl.sql b/doc/sql/rlzyxt_staff_ddl.sql
new file mode 100644
index 0000000..463a882
--- /dev/null
+++ b/doc/sql/rlzyxt_staff_ddl.sql
@@ -0,0 +1,16 @@
+-- ============================================================
+-- 鐮侀紟-浜哄姏璧勬簮绯荤粺锛�10.136.62.70 / mis-ruoyi锛夎ˉ鍒楄剼鏈�
+-- 瀵瑰簲瀹炰綋宸插0鏄庝絾搴撲腑缂哄け鐨勫瓧娈碉紙鑺 72 鏇炬墽琛岃繃锛岀爜榧庡簱鏈墽琛岋級
+-- 鎵ц锛歮ysql -uroot -p'***' mis-ruoyi < rlzyxt_staff_ddl.sql
+-- ============================================================
+
+-- 1. 鍦ㄨ亴鍛樺伐鍙拌处锛氬叆鑱屾椂闂淬�佽柂璧�
+ALTER TABLE `staff_on_job`
+  ADD COLUMN `entry_date` date DEFAULT NULL COMMENT '鍏ヨ亴鏃堕棿' AFTER `contract_expire_time`,
+  ADD COLUMN `salary` decimal(10,2) DEFAULT NULL COMMENT '钖祫' AFTER `entry_date`;
+
+-- 2. 鏂板鍏ヨ亴/绂昏亴锛氱鑱屾棩鏈熴�佺鑱屽師鍥犮�佷氦鎺ユ儏鍐�
+ALTER TABLE `staff_join_leave_record`
+  ADD COLUMN `leave_date` date DEFAULT NULL COMMENT '绂昏亴鏃ユ湡' AFTER `contract_end_time`,
+  ADD COLUMN `leave_reason` varchar(255) DEFAULT NULL COMMENT '绂昏亴鍘熷洜' AFTER `leave_date`,
+  ADD COLUMN `handover_info` varchar(500) DEFAULT NULL COMMENT '浜ゆ帴鎯呭喌' AFTER `leave_reason`;
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
index f82ecc8..f10bc12 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -58,14 +58,23 @@
             if (staffOnJobs.size()>0){
                 StaffOnJob staffOnJob = staffOnJobs.get(0);
                 //鍏堟瘮杈冨埌鏈熸棩鏈�,杩欓噷閫夌敤鍒版湡鏃ユ湡鏈�涔呯殑
-                if (staffJoinLeaveRecord.getContractEndTime().compareTo(staffOnJob.getContractExpireTime())>0) {
+                if (staffJoinLeaveRecord.getContractEndTime() != null
+                        && (staffOnJob.getContractExpireTime() == null
+                        || staffJoinLeaveRecord.getContractEndTime().compareTo(staffOnJob.getContractExpireTime())>0)) {
                     BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
+                    staffOnJob.setContractExpireTime(staffJoinLeaveRecord.getContractEndTime());
+                    //鍏ヨ亴鏃ユ湡瀛楁鍚嶄笉鍚�(contractStartTime -> entryDate)锛孊eanUtils 鎷蜂笉杩囨潵锛岄渶鎵嬪姩璧嬪��
+                    if (staffJoinLeaveRecord.getContractStartTime() != null) {
+                        staffOnJob.setEntryDate(staffJoinLeaveRecord.getContractStartTime());
+                    }
                     staffOnJobMapper.updateById(staffOnJob);
                 }
             }else {
                 StaffOnJob staffOnJob = new StaffOnJob();
                 BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
                 staffOnJob.setContractExpireTime(staffJoinLeaveRecord.getContractEndTime());
+                //鍏ヨ亴鏃ユ湡鍚屾鍒板彴璐︼紝淇濊瘉鍙拌处鈥滃叆鑱屾椂闂粹�濆垪鏈夊��
+                staffOnJob.setEntryDate(staffJoinLeaveRecord.getContractStartTime());
                 staffOnJobMapper.insert(staffOnJob);
             }
         }else {
diff --git a/src/main/resources/mapper/staff/StaffOnJobMapper.xml b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
index 25e79b8..d102b41 100644
--- a/src/main/resources/mapper/staff/StaffOnJobMapper.xml
+++ b/src/main/resources/mapper/staff/StaffOnJobMapper.xml
@@ -6,7 +6,7 @@
         *
         FROM staff_on_job
         where 1=1
-        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+        <if test="staffOnJob.staffState != null">
         AND staff_state = #{staffOnJob.staffState}
         </if>
         <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">
@@ -24,7 +24,7 @@
         *
         FROM staff_on_job
         where 1=1
-        <if test="staffOnJob.staffState != null and staffOnJob.staffState != '' ">
+        <if test="staffOnJob.staffState != null">
             AND staff_state = #{staffOnJob.staffState}
         </if>
         <if test="staffOnJob.staffName != null and staffOnJob.staffName != '' ">

--
Gitblit v1.9.3