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

5
ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserReplacementCardRecordDetailsRes.java
View File

@ -28,6 +28,9 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable {
@ApiModelProperty("申请人姓名")
private String userName;
@ApiModelProperty("申请人头像")
private String avatarName;
@ApiModelProperty("打卡ID")
private Long attendanceId;
@ -70,4 +73,6 @@ public class WgzAppUserReplacementCardRecordDetailsRes implements Serializable {
@ApiModelProperty("创建时间|申请时间")
private LocalDateTime createTime;
@ApiModelProperty("周几")
private String weekday;
}

6
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java
View File

@ -356,7 +356,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
@Override
public BgtPayCalculationDetailBaseVO baseInfo(Long userId, Long recruitId) {
BgtPayCalculationDetailBaseVO vo = new BgtPayCalculationDetailBaseVO();
WgzUser wgzUser = wgzUserService.getById(userId);
WgzUser wgzUser = wgzUserService.findByUserId(userId);
vo.setScore(wgzUser.getScore());
vo.setUsername(wgzUser.getUsername());
vo.setAvatarName(wgzUser.getAvatarName());
@ -372,7 +372,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
.last("limit 1"));
vo.setEntryTime(apply.getEntryTime());
Integer i = attendanceService.attendanceDetail(userId, apply.getId(), null);
Integer i = attendanceService.attendanceDetail(userId, recruitId, null);
BigDecimal totalAmount = recruit.getRecruitAmount().multiply(BigDecimal.valueOf(i));
vo.setAllAmount(totalAmount);
@ -383,7 +383,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
BigDecimal multiply = gz.getRecruitAmount().multiply(BigDecimal.valueOf(gz.getNum()));
addSum = addSum.add(multiply);
}
vo.setPayAmount(totalAmount);
vo.setPayAmount(addSum);
vo.setResidueAmount(vo.getAllAmount().subtract(vo.getPayAmount()));
return vo;