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-21 22:09:54 +08:00
parent dd1228fd59
commit d1be5661ae
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java
View File

@ -459,7 +459,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
BgtAttendanceVO bgtAttendanceVO = new BgtAttendanceVO(); BgtAttendanceVO bgtAttendanceVO = new BgtAttendanceVO();
FbsProjectTask task = taskService.getById(dto.getTaskId()); FbsProjectTask task = taskService.getById(dto.getTaskId());
validTaskTime(task, dto.getDate()); // validTaskTime(task, dto.getDate());
bgtAttendanceVO.setTaskId(task.getId()); bgtAttendanceVO.setTaskId(task.getId());
bgtAttendanceVO.setTaskName(task.getTaskName()); bgtAttendanceVO.setTaskName(task.getTaskName());
@ -513,7 +513,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
@Override @Override
public List<BgtDayAttendanceCountVO> histogram(BgtAttendanceDTO dto) { public List<BgtDayAttendanceCountVO> histogram(BgtAttendanceDTO dto) {
FbsProjectTask task = taskService.getById(dto.getTaskId()); FbsProjectTask task = taskService.getById(dto.getTaskId());
validTaskTime(task, dto.getDate()); // validTaskTime(task, dto.getDate());
LocalDate taskEndTime = DateUtils.str2Localdate(task.getTaskEndTime(), DateUtils.YYYY_MM_DD); LocalDate taskEndTime = DateUtils.str2Localdate(task.getTaskEndTime(), DateUtils.YYYY_MM_DD);
LocalDate date = dto.getDate(); LocalDate date = dto.getDate();

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

@ -461,6 +461,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
public BigDecimal getPayByTaskAndBgt(Long taskId,Long auditorUserId) { public BigDecimal getPayByTaskAndBgt(Long taskId,Long auditorUserId) {
List<WgzPayCalculation> list = list(Wrappers.<WgzPayCalculation>lambdaQuery().eq(WgzPayCalculation::getTaskId, taskId) List<WgzPayCalculation> list = list(Wrappers.<WgzPayCalculation>lambdaQuery().eq(WgzPayCalculation::getTaskId, taskId)
.eq(WgzPayCalculation::getAuditorType, "2")
.eq(WgzPayCalculation::getAuditorUserId, auditorUserId)); .eq(WgzPayCalculation::getAuditorUserId, auditorUserId));
return list.stream().map(WgzPayCalculation::getRecruitAmount).reduce(BigDecimal.ZERO, BigDecimal::add); return list.stream().map(WgzPayCalculation::getRecruitAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
} }