From bdfa320041ffc3e0facba687b021f687d1e8b5c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 27 十一月 2025 16:38:01 +0800
Subject: [PATCH] yys 1.修改人力资源逻辑
---
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
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 50b1090..7368456 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -63,10 +63,12 @@
if (staffOnJobs.size()>0){
StaffOnJob staffOnJob = staffOnJobs.get(0);
//鍏堟瘮杈冨埌鏈熸棩鏈�,杩欓噷閫夌敤鍒版湡鏃ユ湡鏈�涔呯殑
- if (staffJoinLeaveRecord.getContractEndTime().compareTo(staffOnJob.getContractExpireTime())>0) {
- BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
- staffOnJobMapper.updateById(staffOnJob);
- }
+// if (staffJoinLeaveRecord.getContractEndTime().compareTo(staffOnJob.getContractExpireTime())>0) {
+// BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
+// staffOnJobMapper.updateById(staffOnJob);
+// }
+ BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
+ staffOnJobMapper.updateById(staffOnJob);
}else {
StaffOnJob staffOnJob = new StaffOnJob();
BeanUtils.copyProperties(staffJoinLeaveRecord,staffOnJob,ignoreProperties);
@@ -161,10 +163,12 @@
StaffOnJob job = staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery()
.eq(StaffOnJob::getStaffNo, staffJoinLeaveRecord.getStaffNo())).get(0);
//濡傛灉鏇存敼鐨勫悎鍚屽埌鏈熸椂闂存洿涔呭垯鏇存柊,濡傛灉娌℃湁灏变笉鐢ㄦ洿鏂�
- if (staffJoinLeaveRecord.getContractEndTime().compareTo(job.getContractExpireTime())>0) {
- BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
- staffOnJobMapper.updateById(job);
- }
+// if (staffJoinLeaveRecord.getContractEndTime().compareTo(job.getContractExpireTime())>0) {
+// BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
+// staffOnJobMapper.updateById(job);
+// }
+ BeanUtils.copyProperties(staffJoinLeaveRecord,job,ignoreProperties);
+ staffOnJobMapper.updateById(job);
}else {
/*绂昏亴*/
//绂昏亴鐨勭紪杈戜笉浼氬奖鍝嶅湪鑱岃〃
--
Gitblit v1.9.3