From b0765ec5be45d6db1993064d5261bf42e94d161f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 12 八月 2025 16:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_yys
---
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 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 3a07854..9fc8c43 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -14,6 +14,7 @@
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;
@@ -51,8 +52,20 @@
}
@Override
- public List<StaffOnJob> staffOnJobList() {
- return staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffState,1));
+ 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;
+ }
}
--
Gitblit v1.9.3