From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 1f20da2..7c11041 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -7,7 +7,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.WordDateDto;
import com.ruoyi.project.system.domain.SysDept;
@@ -68,9 +67,8 @@
//鍦ㄨ亴鍛樺伐鍙拌处鍒嗛〉鏌ヨ
@Override
- public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJobDto staffOnJob) {
- IPage<StaffOnJobDto> staffOnJobDtoIPage = staffOnJobMapper.staffOnJobListPage(page, staffOnJob);
- return staffOnJobDtoIPage;
+ public IPage<StaffOnJobDto> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return staffOnJobMapper.staffOnJobListPage(page,staffOnJob);
}
//鏂板鍏ヨ亴
@@ -85,7 +83,6 @@
}
// 鍒涘缓鍏ヨ亴鏁版嵁
- syncStudyInfoFromEducation(staffOnJobPrams);
staffOnJobPrams.setContractExpireTime(staffOnJobPrams.getContractEndTime());
staffOnJobPrams.setStaffState(1);
staffOnJobMapper.insert(staffOnJobPrams);
@@ -144,7 +141,6 @@
// 缁戝畾瀛愯〃鏁版嵁
bingingStaffOnJobExtra(id,staffOnJobParams);
// 鏇存柊鍛樺伐鏁版嵁
- syncStudyInfoFromEducation(staffOnJobParams);
staffOnJobParams.setContractExpireTime(staffOnJobParams.getContractEndTime());
return staffOnJobMapper.updateById(staffOnJobParams);
}
@@ -162,7 +158,6 @@
.forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());
}
-
// 鏂板宸ヤ綔缁忓巻
if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){
staffOnJobPrams.getStaffWorkExperienceList().stream()
@@ -177,28 +172,6 @@
.forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
staffEmergencyContactServiceImpl.saveBatch(staffOnJobPrams.getStaffEmergencyContactList());
}
- }
-
- private void syncStudyInfoFromEducation(StaffOnJob staffOnJobPrams) {
- if (staffOnJobPrams == null || CollectionUtils.isEmpty(staffOnJobPrams.getStaffEducationList())) {
- if (staffOnJobPrams != null) {
- staffOnJobPrams.setFirstStudy("/");
- staffOnJobPrams.setProfession("/");
- }
- return;
- }
- Optional<StaffEducation> matchedEducation = staffOnJobPrams.getStaffEducationList().stream()
- .filter(Objects::nonNull)
- .filter(education -> StringUtils.isNotEmpty(education.getMajor()))
- .findFirst();
- if (matchedEducation.isPresent()) {
- StaffEducation education = matchedEducation.get();
- staffOnJobPrams.setFirstStudy(education.getEducation());
- staffOnJobPrams.setProfession(education.getMajor());
- return;
- }
- staffOnJobPrams.setFirstStudy("/");
- staffOnJobPrams.setProfession("/");
}
--
Gitblit v1.9.3