zt/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zt
2025-03-14 18:22:17 +08:00
parent 6e4036b2e9
commit c93ad97c38
24 changed files with 417 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtPayCalculationController.java
View File

@ -1,9 +1,12 @@
package com.ruoyi.web.controller.bgt;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationDetailBaseVO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationDetailListVO;
import com.ruoyi.bgt.domain.dto.BgtApplyForWgzPayAddDTO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationListDTO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationRecordDTO;
import com.ruoyi.bgt.domain.dto.BgtPayCalculationUpdateDTO;
import com.ruoyi.bgt.domain.vo.BgtApplyForWgzPayAddInfoVO;
import com.ruoyi.bgt.domain.vo.BgtPayCalculationDetailBaseVO;
import com.ruoyi.bgt.domain.vo.BgtPayCalculationDetailListVO;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@ -20,7 +23,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 工资结算Controller
@ -75,8 +77,24 @@ public class AppBgtPayCalculationController extends BaseController {
@ApiOperation("总体考勤情况-工资结算-结算记录")
@GetMapping("/record")
public AjaxResult<List<BgtPayCalculationDetailListVO>> record(Long id, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.record(id,recruitId));
public TableDataInfo<BgtPayCalculationDetailListVO> record(BgtPayCalculationRecordDTO dto) {
return iWgzPayCalculationService.record(dto);
}
@ApiOperation("包工头结算务工者剩余工资")
@Log(title = "包工头结算务工者剩余工资", businessType = BusinessType.INSERT)
@RepeatSubmit
@PostMapping("/bgtAdd")
public AjaxResult<Boolean> bgtAdd(@Validated @RequestBody BgtApplyForWgzPayAddDTO dto) {
return AjaxResult.success(iWgzPayCalculationService.bgtAdd(dto));
}
@ApiOperation("总体考勤情况-工资结算-获取工资结算所需的信息")
@GetMapping("/payInfo")
public AjaxResult<BgtApplyForWgzPayAddInfoVO> payInfo(Long userId, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.payInfo(userId,recruitId));
}
}