From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 87 +++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 53 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..d6eac65 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,30 @@
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.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserDept;
+import com.ruoyi.framework.web.domain.R;
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.Date;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -37,37 +36,19 @@
* @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;
+ private final AccountExpenseMapper accountExpenseMapper;
@Override
- public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
LambdaQueryWrapper<StaffSalaryMain> staffSalaryMainLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(staffSalaryMain != null){
if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryTitle())){
@@ -85,31 +66,31 @@
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
main.setStaffSalaryDetailList(staffSalaryDetailList);
});
- return AjaxResult.success(page1);
+ return R.ok(page1);
}
@Override
- public AjaxResult add(StaffSalaryMain staffSalaryMain) {
+ public R<?> add(StaffSalaryMain staffSalaryMain) {
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- return AjaxResult.success("鏂板鎴愬姛");
+ return R.ok(null, "鏂板鎴愬姛");
}
@Override
- public AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
+ public R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
if(staffSalaryMain == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
-// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
+// return R.fail("寰呭鏍镐笉鍙紪杈�");
// }
staffSalaryMainMapper.updateById(staffSalaryMain);
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(staffSalaryMain.getStaffSalaryDetailList())){
@@ -134,27 +115,27 @@
accountExpense.setInputTime(new Date());
accountExpenseMapper.insert(accountExpense);
}
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
staffSalaryMainMapper.deleteBatchIds(ids);
staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().in(StaffSalaryDetail::getMainId, ids));
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
@Override
- public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
+ public R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto) {
if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
if(CollectionUtils.isEmpty(longs)){
- return AjaxResult.error("鏃犲憳宸�");
+ return R.fail("鏃犲憳宸�");
}
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
@@ -170,7 +151,7 @@
schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
mapList.add(id);
}
- return AjaxResult.success(mapList);
+ return R.ok(mapList);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
--
Gitblit v1.9.3