From 6b614c1a3597cda30ab992357544ff0db31e08ee Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 30 四月 2026 09:17:13 +0800
Subject: [PATCH] refactor(production): 优化生产报工控制器代码结构

---
 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 3613da3..62c920c 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -186,7 +186,11 @@
                     .filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
                     .forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
             staffEducationService.saveBatch(staffOnJobPrams.getStaffEducationList());
+            staffOnJobPrams.setFirstStudy(staffOnJobPrams.getStaffEducationList().get(staffOnJobPrams.getStaffEducationList().size()-1).getEducation());
+            staffOnJobPrams.setProfession(staffOnJobPrams.getStaffEducationList().get(staffOnJobPrams.getStaffEducationList().size()-1).getMajor());
         }
+
+
         // 鏂板宸ヤ綔缁忓巻
         if(CollectionUtils.isNotEmpty(staffOnJobPrams.getStaffWorkExperienceList())){
             staffOnJobPrams.getStaffWorkExperienceList().stream()
@@ -200,7 +204,11 @@
                     .filter(Objects::nonNull) // 杩囨护null瀵硅薄锛岄伩鍏嶇┖鎸囬拡
                     .forEach(staff -> staff.setStaffOnJobId(id)); // 璧嬪��
             staffEmergencyContactServiceImpl.saveBatch(staffOnJobPrams.getStaffEmergencyContactList());
+            staffOnJobPrams.setEmergencyContact(staffOnJobPrams.getStaffEmergencyContactList().get(0).getContactName());
+            staffOnJobPrams.setEmergencyContactPhone(staffOnJobPrams.getStaffEmergencyContactList().get(0).getContactPhone());
         }
+        staffOnJobMapper.updateById(staffOnJobPrams);
+
     }
 
 

--
Gitblit v1.9.3