瀏覽代碼

返回类型3

Reiskuchen 5 年之前
父節點
當前提交
3e62d35eb4

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -165,7 +165,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //顺便再获取一下可分配时间
             Integer totalWorkingTime = 0;
             //以下区间被认为是工作时间
-            Integer[] workType = {0, 1, 2, 3, 4, 5};
+            Integer[] workType = {-1, 0, 1, 2, 3, 4, 5};
             //工作时间筛选
             for (TimeCalculation timeCalculation : timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
                     .eq("date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")))

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TimeCalculationServiceImpl.java

@@ -136,7 +136,7 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
             LocalDate start = LocalDate.parse(startDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             LocalDate end = LocalDate.parse(endDate, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             //获取时间段内本人全部的工作记录 娱乐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>()
                     .eq("user_id", request.getHeader("Token"))
                     .in("action_type", workType)