备份

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaSalaryController.java

@@ -47,6 +47,14 @@ public class OaSalaryController extends BaseController {
     public TableDataInfo<OaSalaryVo> list(OaSalaryBo bo, PageQuery pageQuery) {
         return iOaSalaryService.queryPageList(bo, pageQuery);
     }
+    /**
+     * 查询薪资管理列表
+     */
+    @SaCheckPermission("oa:salary:list")
+    @GetMapping("/list-worker")
+    public TableDataInfo<OaSalaryVo> listWorker(OaSalaryBo bo, PageQuery pageQuery) {
+        return iOaSalaryService.queryPageList(bo, pageQuery);
+    }
 
     /**
      * 批量写入user到salary中
@@ -116,7 +124,7 @@ public class OaSalaryController extends BaseController {
 
 
     @PostMapping("/calc")
-    public void calc(@RequestBody OaSalaryBo bo) {
-        iOaSalaryService.calcSalary(bo);
+    public R<Void> calc(@RequestBody OaSalaryBo bo) {
+        return R.ok(iOaSalaryService.calcSalary(bo));
     }
 }