diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java index 4f04fc6..5146555 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java @@ -488,11 +488,20 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl(). + 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)); vo.setAllAmount(totalAmount); - List gzs = findByUserIdRecruitIdNewestData(userId, apply.getId()); + List gzs = findByUserIdRecruitIdNewestData(userId, recruitId); BigDecimal addSum = new BigDecimal(0); for (WgzPayCalculation gz : gzs) { //金额*天数=实际工资 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java index 9e98fdb..9cb9dc2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzReissueacardServiceImpl.java @@ -254,8 +254,8 @@ public class WgzReissueacardServiceImpl extends ServicePlusImpl