|
|
@@ -651,6 +651,13 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
|
|
|
planIdList = coreDrillPlanMapper.selectIdByParentId(plan.getId());
|
|
|
planId = null;
|
|
|
}
|
|
|
+ if (ObjectUtil.isNotEmpty(request.getRange())) {
|
|
|
+ Date st = request.getRange()[0];
|
|
|
+ Date ed = request.getRange()[1];
|
|
|
+ request.setStartTime(DateUtil.beginOfMonth(DateUtil.beginOfDay(st)));
|
|
|
+ request.setEndTime(DateUtil.endOfMonth(DateUtil.endOfDay(ed)));
|
|
|
+ }
|
|
|
+
|
|
|
if (ObjectUtil.isAllEmpty(planId, planIdList)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|