|
|
@@ -11,8 +11,6 @@ import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.concurrent.CopyOnWriteArrayList;
|
|
|
-
|
|
|
/**
|
|
|
* @author fjj
|
|
|
* @date 2019/4/11 4:14 PM
|
|
|
@@ -43,11 +41,15 @@ public class ScheduleServiceImpl implements ScheduleService {
|
|
|
Date startDate = simpleDateFormat.parse(simpleDateFormat.format(scheduleSearchForm.getStartDate()));
|
|
|
scheduleSearchForm.setStartDate(startDate);
|
|
|
|
|
|
+ System.out.println(startDate);
|
|
|
+
|
|
|
Calendar calendarStartDate = Calendar.getInstance();
|
|
|
calendarStartDate.setTime(startDate);
|
|
|
calendarStartDate.add(Calendar.DAY_OF_YEAR, 7);
|
|
|
scheduleSearchForm.setEndDate(calendarStartDate.getTime());
|
|
|
|
|
|
+ System.out.println(calendarStartDate.getTime());
|
|
|
+
|
|
|
// 按照日期整理ScheduleItem
|
|
|
List<ScheduleItem> scheduleItemList = scheduleMapper.selectSchedule(scheduleSearchForm);
|
|
|
List<ScheduleVO> scheduleVOList = new ArrayList<>();
|