|
@@ -136,7 +136,7 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
|
|
LocalDate start = LocalDate.parse(startDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
LocalDate start = LocalDate.parse(startDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
LocalDate end = LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
LocalDate end = LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
|
//获取时间段内本人全部的工作记录 娱乐6 7 8不计入
|
|
//获取时间段内本人全部的工作记录 娱乐6 7 8不计入
|
|
- Integer[] workType = {0, 1, 2, 3, 4, 5};
|
|
|
|
|
|
+ Integer[] workType = {-1, 0, 1, 2, 3, 4, 5};
|
|
List<TimeCalculation> dataList = timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
|
|
List<TimeCalculation> dataList = timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
|
|
.eq("user_id", request.getHeader("Token"))
|
|
.eq("user_id", request.getHeader("Token"))
|
|
.in("action_type", workType)
|
|
.in("action_type", workType)
|