From 4143064f5cc41ea38aac3011f847066fe896fed3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 15:13:05 +0800
Subject: [PATCH] 导出工资明细
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 84 insertions(+), 20 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 a6d4500..41305e4 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -3,13 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.staff.excel.StaffSalaryExportData;
+import jakarta.servlet.http.HttpServletResponse;
import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
import com.ruoyi.staff.mapper.StaffSalaryDetailMapper;
import com.ruoyi.staff.mapper.StaffSalaryMainMapper;
@@ -23,7 +24,7 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,7 +46,6 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
- private final AccountExpenseMapper accountExpenseMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -61,6 +61,7 @@
staffSalaryMainLambdaQueryWrapper.eq(StaffSalaryMain::getStatus, staffSalaryMain.getStatus());
}
}
+ staffSalaryMainLambdaQueryWrapper.orderByDesc(StaffSalaryMain::getId);
Page<StaffSalaryMain> page1 = staffSalaryMainMapper.selectPage(page, staffSalaryMainLambdaQueryWrapper);
page1.getRecords().forEach(main -> {
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
@@ -100,21 +101,6 @@
});
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("淇敼鎴愬姛");
}
@@ -154,6 +140,84 @@
return AjaxResult.success(mapList);
}
+ @Override
+ public AjaxResult calculateSalaryByEmployee(StaffSalaryCalculateDto staffSalaryCalculateDto) {
+ if (staffSalaryCalculateDto == null
+ || staffSalaryCalculateDto.getStaffOnJobId() == null
+ || StringUtils.isEmpty(staffSalaryCalculateDto.getSalaryMonth())) {
+ return AjaxResult.error("鍙傛暟閿欒");
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", staffSalaryCalculateDto.getStaffOnJobId());
+ map.put("staffOnJobId", staffSalaryCalculateDto.getStaffOnJobId());
+ map.put("salaryMonth", staffSalaryCalculateDto.getSalaryMonth());
+ map.put("staffName", staffSalaryCalculateDto.getStaffName());
+ map.put("postName", staffSalaryCalculateDto.getPostName());
+ map.put("deptName", staffSalaryCalculateDto.getDeptName());
+ if (staffSalaryCalculateDto.getBasicSalary() != null) {
+ map.put("basicSalary", staffSalaryCalculateDto.getBasicSalary());
+ }
+ map.put("pieceSalary", staffSalaryCalculateDto.getPieceSalary());
+ map.put("hourlySalary", staffSalaryCalculateDto.getHourlySalary());
+ map.put("otherIncome", staffSalaryCalculateDto.getOtherIncome());
+ map.put("socialPersonal", staffSalaryCalculateDto.getSocialPersonal());
+ map.put("fundPersonal", staffSalaryCalculateDto.getFundPersonal());
+ map.put("otherDeduct", staffSalaryCalculateDto.getOtherDeduct());
+ map.put("socialSupplementAmount", staffSalaryCalculateDto.getSocialSupplementAmount());
+ map.put("salaryTax", staffSalaryCalculateDto.getSalaryTax());
+ map.put("grossSalary", staffSalaryCalculateDto.getGrossSalary());
+ map.put("deductSalary", staffSalaryCalculateDto.getDeductSalary());
+ map.put("netSalary", staffSalaryCalculateDto.getNetSalary());
+ map.put("remark", staffSalaryCalculateDto.getRemark());
+ schemeApplicableStaffService.calculateByEmployeeId(
+ staffSalaryCalculateDto.getStaffOnJobId().intValue(),
+ map,
+ staffSalaryCalculateDto.getSalaryMonth()
+ );
+ return AjaxResult.success(map);
+ }
+
+ @Override
+ public void exportSalaryDetail(HttpServletResponse response, String salaryMonth) {
+ LambdaQueryWrapper<StaffSalaryMain> mainWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotEmpty(salaryMonth)) {
+ mainWrapper.eq(StaffSalaryMain::getSalaryMonth, salaryMonth);
+ }
+ List<StaffSalaryMain> mainList = staffSalaryMainMapper.selectList(mainWrapper);
+
+ List<StaffSalaryExportData> exportDataList = new ArrayList<>();
+ for (StaffSalaryMain main : mainList) {
+ List<StaffSalaryDetail> detailList = staffSalaryDetailMapper.selectList(
+ new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId())
+ );
+
+ for (StaffSalaryDetail detail : detailList) {
+ StaffSalaryExportData exportData = new StaffSalaryExportData();
+ exportData.setSalaryMonth(main.getSalaryMonth());
+ exportData.setSalaryTitle(main.getSalaryTitle());
+ exportData.setStaffName(detail.getStaffName());
+ exportData.setDeptName(detail.getDeptName());
+ exportData.setBasicSalary(detail.getBasicSalary());
+ exportData.setPieceSalary(detail.getPieceSalary());
+ exportData.setHourlySalary(detail.getHourlySalary());
+ exportData.setOtherIncome(detail.getOtherIncome());
+ exportData.setSocialPersonal(detail.getSocialPersonal());
+ exportData.setFundPersonal(detail.getFundPersonal());
+ exportData.setOtherDeduct(detail.getOtherDeduct());
+ exportData.setSocialSupplementAmount(detail.getSocialSupplementAmount());
+ exportData.setSalaryTax(detail.getSalaryTax());
+ exportData.setGrossSalary(detail.getGrossSalary());
+ exportData.setDeductSalary(detail.getDeductSalary());
+ exportData.setNetSalary(detail.getNetSalary());
+ exportData.setRemark(detail.getRemark());
+ exportDataList.add(exportData);
+ }
+ }
+
+ ExcelUtil<StaffSalaryExportData> util = new ExcelUtil<>(StaffSalaryExportData.class);
+ util.exportExcel(response, exportDataList, "鍛樺伐钖祫鏄庣粏");
+ }
+
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
return new ArrayList<>();
--
Gitblit v1.9.3