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

111

Browse Source
This commit is contained in:
罗成
2025-03-20 18:47:02 +08:00
parent f2f104b72f
commit b23816c35c
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,11 +488,20 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
.last("limit 1")); .last("limit 1"));
vo.setEntryTime(apply.getEntryTime()); vo.setEntryTime(apply.getEntryTime());
Integer i = attendanceService.attendanceDetail(userId, recruitId, null); int i = iWgzAttendanceService.count(
new LambdaQueryWrapper<WgzAttendance>().
eq(WgzAttendance::getUserId, userId).
eq(WgzAttendance::getRecruitId,recruitId).and(wrapper -> wrapper
.isNotNull(WgzAttendance::getClockInTime)
.or()
.isNotNull(WgzAttendance::getClockOutTime)
)
);
// Integer i = attendanceService.attendanceDetail(userId, recruitId, null);
BigDecimal totalAmount = recruit.getRecruitAmount().multiply(BigDecimal.valueOf(i)); BigDecimal totalAmount = recruit.getRecruitAmount().multiply(BigDecimal.valueOf(i));
vo.setAllAmount(totalAmount); vo.setAllAmount(totalAmount);
List<WgzPayCalculation> gzs = findByUserIdRecruitIdNewestData(userId, apply.getId()); List<WgzPayCalculation> gzs = findByUserIdRecruitIdNewestData(userId, recruitId);
BigDecimal addSum = new BigDecimal(0); BigDecimal addSum = new BigDecimal(0);
for (WgzPayCalculation gz : gzs) { for (WgzPayCalculation gz : gzs) {
//金额*天数=实际工资 //金额*天数=实际工资

8
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java
View File

@ -254,8 +254,8 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
exceptionType = exceptionType.replace("\\b1\\b", "5"); exceptionType = exceptionType.replace("\\b1\\b", "5");
exceptionType = exceptionType.replace("\\b3\\b", "5"); exceptionType = exceptionType.replace("\\b3\\b", "5");
attendance.setExceptionType(exceptionType); attendance.setExceptionType(exceptionType);
attendance.setLate(1); attendance.setLate(0);
attendance.setMissedIn(1); attendance.setMissedIn(0);
if(attendance.getClockInTime() == null){ if(attendance.getClockInTime() == null){
attendance.setClockInTime(byId.getNowTime()); attendance.setClockInTime(byId.getNowTime());
} }
@ -263,8 +263,8 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl<WgzReissueacardM
exceptionType = exceptionType.replace("\\b2\\b", "6"); exceptionType = exceptionType.replace("\\b2\\b", "6");
exceptionType = exceptionType.replace("\\b4\\b", "6"); exceptionType = exceptionType.replace("\\b4\\b", "6");
attendance.setExceptionType(exceptionType); attendance.setExceptionType(exceptionType);
attendance.setEarlyLeave(1); attendance.setEarlyLeave(0);
attendance.setMissedOut(1); attendance.setMissedOut(0);
if(attendance.getClockOutTime() == null){ if(attendance.getClockOutTime() == null){
attendance.setClockOutTime(byId.getNowTime()); attendance.setClockOutTime(byId.getNowTime());
} }