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/StaffSalaryMainServiceImpl.java | 69 +++++++---------------------------
1 files changed, 15 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index 26a34c1..aad785a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -2,31 +2,26 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
-import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
-import com.ruoyi.staff.pojo.*;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
+import com.ruoyi.staff.pojo.StaffLeave;
+import com.ruoyi.staff.pojo.StaffSalaryDetail;
+import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryDetailService;
import com.ruoyi.staff.service.StaffSalaryMainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -37,34 +32,15 @@
* @since 2026-03-06 01:22:05
*/
@Service
+@RequiredArgsConstructor
public class StaffSalaryMainServiceImpl extends ServiceImpl<StaffSalaryMainMapper, StaffSalaryMain> implements StaffSalaryMainService {
- @Autowired
- private StaffSalaryMainMapper staffSalaryMainMapper;
-
- @Autowired
- private StaffSalaryDetailService staffSalaryDetailService;
-
- @Autowired
- private StaffSalaryDetailMapper staffSalaryDetailMapper;
-
- @Autowired
- private SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
-
- @Autowired
- private SysUserDeptMapper sysUserDeptMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private StaffOnJobMapper staffOnJobMapper;
-
- @Autowired
- private StaffLeaveMapper staffLeaveMapper;
-
- @Autowired
- private AccountExpenseMapper accountExpenseMapper;
+ private final StaffSalaryMainMapper staffSalaryMainMapper;
+ private final StaffSalaryDetailService staffSalaryDetailService;
+ private final StaffSalaryDetailMapper staffSalaryDetailMapper;
+ private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
+ private final SysUserDeptMapper sysUserDeptMapper;
+ private final StaffLeaveMapper staffLeaveMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -118,21 +94,6 @@
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- }
- // 鍜岃储鍔¤仈鍔紝鏂板鏀嚭
- if(staffSalaryMain.getStatus().equals(5)){
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessType(3);
- accountExpense.setExpenseMoney(staffSalaryMain.getTotalSalary());
- accountExpense.setBusinessId(staffSalaryMain.getId());
- accountExpense.setExpenseDate(new Date());
- accountExpense.setExpenseMethod("2");
- accountExpense.setExpenseType("1");
- accountExpense.setExpenseDescribed(staffSalaryMain.getSalaryTitle());
- accountExpense.setNote(staffSalaryMain.getRemark());
- accountExpense.setInputUser(SecurityUtils.getLoginUser().getNickName());
- accountExpense.setInputTime(new Date());
- accountExpenseMapper.insert(accountExpense);
}
return AjaxResult.success("淇敼鎴愬姛");
}
--
Gitblit v1.9.3