|
|
@@ -211,7 +211,6 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
Integer tenantId = SecurityUtils.getTenantId();
|
|
|
BigDecimal totalWorkTime = BigDecimal.ZERO;
|
|
|
LocalDateTime dateTime = LocalDateTime.now();
|
|
|
- LocalDate reportDate = dateTime.toLocalDate();
|
|
|
LocalDateTime timingTime = pmWorkReport.getTimingTime();
|
|
|
LocalDateTime currentTimePlusMinutes = dateTime.plusMinutes(5);
|
|
|
String ccTo = pmWorkReport.getCcTo();
|
|
|
@@ -258,7 +257,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
|
|
|
}
|
|
|
|
|
|
LambdaQueryWrapper<PmWorkReport> wrapper = Wrappers.lambdaQuery();
|
|
|
- wrapper.eq(PmWorkReport::getReportDate, reportDate)
|
|
|
+ wrapper.eq(PmWorkReport::getReportDate, pmWorkReport.getReportDate())
|
|
|
.eq(PmWorkReport::getSubmitterId, userId)
|
|
|
.eq(PmWorkReport::getTenantId, tenantId);
|
|
|
if (!pmWorkReportMapper.selectList(wrapper).isEmpty()) {
|
