|
|
|
@ -64,7 +64,7 @@ public class TaskTemplateQueryServiceImpl implements TaskTemplateQueryService { |
|
|
|
//taskStartDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)); |
|
|
|
//taskEndDate = LocalDate.now().with(TemporalAdjusters.nextOrSame(DayOfWeek.SUNDAY)); |
|
|
|
taskStartDate = createTime.toLocalDate(); |
|
|
|
taskEndDate = taskStartDate.plusDays(7); |
|
|
|
taskEndDate = taskStartDate.plusDays(6); |
|
|
|
if (taskEndDate.isBefore(now)) { |
|
|
|
taskStartDate = null; |
|
|
|
taskEndDate = null; |
|
|
|
@ -73,7 +73,7 @@ public class TaskTemplateQueryServiceImpl implements TaskTemplateQueryService { |
|
|
|
break; |
|
|
|
case MONTHLY_TASK: |
|
|
|
taskStartDate = createTime.toLocalDate(); |
|
|
|
taskEndDate = taskStartDate.plusDays(30); |
|
|
|
taskEndDate = taskStartDate.plusDays(29); |
|
|
|
stageCode = TaskStageEnum.FIRST_MONTH; |
|
|
|
if (taskEndDate.isBefore(now)) { |
|
|
|
//判断是否跨月 |
|
|
|
|