From bfe7fe047e7682cd3c3a6c0d876a82df614ee85e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 29 四月 2026 10:32:54 +0800
Subject: [PATCH] feat(staff): 增加员工转正与调岗功能

---
 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 90f884e..05aaae4 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -5,17 +5,18 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.staff.dto.StaffOnJobDto;
 import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
 import com.ruoyi.staff.mapper.StaffOnJobMapper;
 import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
 import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
 import com.ruoyi.staff.service.IStaffOnJobService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -50,6 +51,30 @@
         util.exportExcel(response, staffOnJobs, "鍦ㄨ亴鍛樺伐鍙拌处瀵煎嚭");
     }
 
+    @Override
+    public List<StaffJoinLeaveRecord> staffOnJobList() {
+        return staffJoinLeaveRecordMapper.staffOnJobList();
+    }
+
+    @Override
+    public Boolean importData(MultipartFile file) {
+        try {
+            ExcelUtil<StaffOnJob> util = new ExcelUtil<>(StaffOnJob.class);
+            List<StaffOnJob> staffOnJobs = util.importExcel(file.getInputStream());
+            return saveOrUpdateBatch(staffOnJobs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    public int transferPost(StaffOnJobDto staffOnJobDto) {
+        StaffOnJob staffOnJob = new StaffOnJob();
+        BeanUtils.copyProperties(staffOnJobDto,staffOnJob);
+        staffOnJob.setPostJob(staffOnJobDto.getTargetPost());
+        return staffOnJobMapper.updateById(staffOnJob);
+    }
 
 
 }

--
Gitblit v1.9.3