From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 69 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 38 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..cbf9ebe 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -34,10 +34,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
+import java.io.*;
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.time.LocalDate;
@@ -111,7 +108,8 @@
// 鍒涘缓鍚堝悓璁板綍
StaffContract staffContract = new StaffContract();
staffContract.setStaffOnJobId(staffOnJobPrams.getId());
- staffContract.setContractTerm(staffOnJobPrams.getContractTerm());
+ String contractTerm = staffOnJobPrams.getContractTerm();
+ staffContract.setContractTerm(StringUtils.isNotEmpty(contractTerm) ? contractTerm : null);
staffContract.setContractStartTime(staffOnJobPrams.getContractStartTime());
staffContract.setContractEndTime(staffOnJobPrams.getContractEndTime());
return staffContractMapper.insert(staffContract);
@@ -321,41 +319,36 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean importData(MultipartFile file) {
- try {
- ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
- List<StaffOnJobExcelDto> staffOnJobs = util.importExcel(file.getInputStream());
- if (CollectionUtils.isEmpty(staffOnJobs)){
- return false;
- }
- // 鑾峰彇鎵�鏈夐儴闂ㄦ暟鎹�
- List<SysDept> sysDepts = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, 0));
- // 鑾峰彇鎵�鏈夎鑹叉暟鎹�
- List<SysRole> sysRoles = sysRoleMapper.selectRoleAll();
- staffOnJobs.forEach(staffOnJob -> {
- StaffOnJobDto staffOnJobDto = new StaffOnJobDto();
- BeanUtils.copyProperties(staffOnJob, staffOnJobDto);
- // 閫氳繃鍚嶇О鑾峰彇閮ㄩ棬id
- staffOnJobDto.setSysDeptId(// ... existing code ...
- sysDepts.stream()
- .filter(dept -> dept.getDeptName() != null && dept.getDeptName().equals(staffOnJob.getSysDeptName()))
- .findFirst()
- .map(SysDept::getDeptId)
- .orElse(null)
- );
- // 閫氳繃鍚嶇О鑾峰彇瑙掕壊id
- staffOnJobDto.setRoleId(sysRoles.stream()
- .filter(role -> role.getRoleName() != null && role.getRoleName().equals(staffOnJob.getRoleName()))
- .findFirst()
- .map(SysRole::getRoleId)
- .orElse( null));
- add(staffOnJobDto);
- });
- return true;
- } catch (Exception e) {
- e.printStackTrace();
+ public Boolean importData(MultipartFile file) throws IOException {
+ ExcelUtil<StaffOnJobExcelDto> util = new ExcelUtil<>(StaffOnJobExcelDto.class);
+ List<StaffOnJobExcelDto> staffOnJobs = util.importExcel(file.getInputStream());
+ if (CollectionUtils.isEmpty(staffOnJobs)){
return false;
}
+ // 鑾峰彇鎵�鏈夐儴闂ㄦ暟鎹�
+ List<SysDept> sysDepts = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery().eq(SysDept::getDelFlag, 0));
+ // 鑾峰彇鎵�鏈夎鑹叉暟鎹�
+ List<SysRole> sysRoles = sysRoleMapper.selectRoleAll();
+ staffOnJobs.forEach(staffOnJob -> {
+ StaffOnJobDto staffOnJobDto = new StaffOnJobDto();
+ BeanUtils.copyProperties(staffOnJob, staffOnJobDto);
+ // 閫氳繃鍚嶇О鑾峰彇閮ㄩ棬id
+ staffOnJobDto.setSysDeptId(
+ sysDepts.stream()
+ .filter(dept -> dept.getDeptName() != null && dept.getDeptName().equals(staffOnJob.getSysDeptName()))
+ .findFirst()
+ .map(SysDept::getDeptId)
+ .orElse(null)
+ );
+ // 閫氳繃鍚嶇О鑾峰彇瑙掕壊id
+ staffOnJobDto.setRoleId(sysRoles.stream()
+ .filter(role -> role.getRoleName() != null && role.getRoleName().equals(staffOnJob.getRoleName()))
+ .findFirst()
+ .map(SysRole::getRoleId)
+ .orElse( null));
+ add(staffOnJobDto);
+ });
+ return true;
}
--
Gitblit v1.9.3