From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 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 d6eac65..aad785a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -3,11 +3,8 @@
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
@@ -23,7 +20,6 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -45,10 +41,9 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
- private final AccountExpenseMapper accountExpenseMapper;
@Override
- public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
LambdaQueryWrapper<StaffSalaryMain> staffSalaryMainLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(staffSalaryMain != null){
if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryTitle())){
@@ -66,31 +61,31 @@
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
main.setStaffSalaryDetailList(staffSalaryDetailList);
});
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
@Override
- public R<?> add(StaffSalaryMain staffSalaryMain) {
+ public AjaxResult add(StaffSalaryMain staffSalaryMain) {
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- return R.ok(null, "鏂板鎴愬姛");
+ return AjaxResult.success("鏂板鎴愬姛");
}
@Override
- public R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
+ public AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
if(staffSalaryMain == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
-// return R.fail("寰呭鏍镐笉鍙紪杈�");
+// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
// }
staffSalaryMainMapper.updateById(staffSalaryMain);
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(staffSalaryMain.getStaffSalaryDetailList())){
@@ -100,42 +95,27 @@
});
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 R.ok(null, "淇敼鎴愬姛");
+ return AjaxResult.success("淇敼鎴愬姛");
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
staffSalaryMainMapper.deleteBatchIds(ids);
staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().in(StaffSalaryDetail::getMainId, ids));
- return R.ok(null, "鍒犻櫎鎴愬姛");
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
}
@Override
- public R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto) {
+ public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
if(CollectionUtils.isEmpty(longs)){
- return R.fail("鏃犲憳宸�");
+ return AjaxResult.error("鏃犲憳宸�");
}
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
@@ -151,7 +131,7 @@
schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
mapList.add(id);
}
- return R.ok(mapList);
+ return AjaxResult.success(mapList);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
--
Gitblit v1.9.3