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-13 18:04:13 +08:00
parent ee0411263f
commit eeada32164
8 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,8 @@ public class AppBgtPayCalculationController extends BaseController {
@ApiOperation("总体考勤情况-工资结算-基础信息")
@GetMapping("/baseInfo")
public AjaxResult<BgtPayCalculationDetailBaseVO> baseInfo(Long id, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.baseInfo(id,recruitId));
public AjaxResult<BgtPayCalculationDetailBaseVO> baseInfo(Long userId, Long recruitId) {
return AjaxResult.success(iWgzPayCalculationService.baseInfo(userId,recruitId));
}
@ApiOperation("总体考勤情况-工资结算-结算记录")

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bgt/AppBgtReissueacardController.java
View File

@ -8,8 +8,8 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.wgz.bo.res.WgzAppUserReplacementCardRecordDetailsRes;
import com.ruoyi.wgz.bo.res.WgzReplacementCardRecordRes;
import com.ruoyi.wgz.domain.WgzReissueacard;
import com.ruoyi.wgz.service.IWgzReissueacardService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -19,6 +19,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.time.DayOfWeek;
import java.util.Locale;
/**
* 补卡申请Controller
@ -46,9 +48,13 @@ public class AppBgtReissueacardController extends BaseController {
@ApiOperation("获取补卡申请详细信息")
@GetMapping("/{id}")
public AjaxResult<WgzReissueacard> getInfo(@NotNull(message = "主键不能为空")
public AjaxResult<WgzAppUserReplacementCardRecordDetailsRes> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return AjaxResult.success(iWgzReissueacardService.queryById(id));
WgzAppUserReplacementCardRecordDetailsRes res = iWgzReissueacardService.userReplacementCardRecordDetails(id);
DayOfWeek dayOfWeek = res.getNowTime().getDayOfWeek();
String localizedWeekday = dayOfWeek.getDisplayName(java.time.format.TextStyle.FULL, Locale.CHINA);
res.setWeekday(localizedWeekday);
return AjaxResult.success(res);
}
@ApiOperation("补卡审核")