Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java

@@ -3,14 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

@@ -24,47 +24,47 @@
 * @author 芯导软件（江苏）有限公司
 * @since 2026-03-06 01:22:05
 */
@Api(tags = "员工工资主表")
@Tag(name = "员工工资主表")
@RestController
@RequestMapping("/staffSalaryMain")
public class StaffSalaryMainController {
@AllArgsConstructor
public class StaffSalaryMainController extends BaseController {

    @Autowired
    private StaffSalaryMainService staffSalaryMainService;

    @GetMapping("/listPage")
    @ApiOperation("员工工资主表分页查询")
    public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
    @Operation(summary = "员工工资主表分页查询")
    public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
        return staffSalaryMainService.listPage(page, staffSalaryMain);
    }

    @ApiOperation("通过部门ids获取用户信息计算每个员工的工资")
    @Operation(summary = "通过部门ids获取用户信息计算每个员工的工资")
    @PostMapping("/calculateSalary")
    public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
    public R<?> calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
        return staffSalaryMainService.calculateSalary(calculateSalaryDto);
    }

    @PostMapping("/add")
    @ApiOperation("新建工资表")
    @Operation(summary = "新建工资表")
    @Log(title = "新建工资表", businessType = BusinessType.INSERT)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
    public R<?> add(@RequestBody StaffSalaryMain staffSalaryMain) {
        return staffSalaryMainService.add(staffSalaryMain);
    }

    @PostMapping("/update")
    @ApiOperation("修改工资表")
    @Operation(summary = "修改工资表")
    @Log(title = "修改工资表", businessType = BusinessType.UPDATE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
    public R<?> updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
        return staffSalaryMainService.updateStaffSalaryMain(staffSalaryMain);
    }

    @DeleteMapping("/delete")
    @ApiOperation("删除工资表")
    @Operation(summary = "删除工资表")
    @Log(title = "删除工资表", businessType = BusinessType.DELETE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delete(@RequestBody List<Long> ids) {
    public R<?> delete(@RequestBody List<Long> ids) {
        return staffSalaryMainService.delete(ids);
    }