From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格
---
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
index 2003e68..0317a3b 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -1,9 +1,11 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.CalculateSalaryDto;
+import com.ruoyi.staff.dto.StaffSalaryCalculateDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
+import jakarta.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@@ -18,13 +20,19 @@
*/
public interface StaffSalaryMainService extends IService<StaffSalaryMain> {
- R listPage(Page page, StaffSalaryMain staffSalaryMain);
+ AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain);
- R<?> add(StaffSalaryMain staffSalaryMain);
+ AjaxResult add(StaffSalaryMain staffSalaryMain);
- R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
+ AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
- R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
+ AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
+
+ AjaxResult calculateSalaryByEmployee(StaffSalaryCalculateDto staffSalaryCalculateDto);
+
+ void exportSalaryDetail(HttpServletResponse response, String salaryMonth);
+
+ AjaxResult getAvailableDepts(String salaryMonth);
}
--
Gitblit v1.9.3