From 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:01:11 +0800
Subject: [PATCH] refactor(controller): 将控制器响应结果统一为R类型并继承BaseController

---
 src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 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..d6eac65 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -7,7 +7,7 @@
 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.framework.web.domain.R;
 import com.ruoyi.project.system.mapper.SysUserDeptMapper;
 import com.ruoyi.staff.dto.CalculateSalaryDto;
 import com.ruoyi.staff.mapper.StaffLeaveMapper;
@@ -48,7 +48,7 @@
     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())){
@@ -66,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())){
@@ -115,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) {
@@ -151,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