|
@@ -119,7 +119,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
//工作时间筛选
|
|
//工作时间筛选
|
|
List<TimeCalculation> timeCalculations = timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
|
|
List<TimeCalculation> timeCalculations = timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
|
|
.eq("date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
|
.eq("date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
|
- .eq("user_id", userId)
|
|
|
|
|
|
+ .eq("user_id", map.get("id"))
|
|
.in("action_type", workType));
|
|
.in("action_type", workType));
|
|
if (timeCalculations != null) {
|
|
if (timeCalculations != null) {
|
|
for (TimeCalculation timeCalculation : timeCalculations) {
|
|
for (TimeCalculation timeCalculation : timeCalculations) {
|