|
|
@ -53,6 +53,7 @@ public class TaskController extends JeecgController<Task, ITaskService> { |
|
|
|
private ITaskService taskService; |
|
|
|
private ITaskService taskService; |
|
|
|
|
|
|
|
|
|
|
|
private static final String ADMIN = "admin"; |
|
|
|
private static final String ADMIN = "admin"; |
|
|
|
|
|
|
|
private static final String FORMAT = "yyyy/MM/dd HH:mm:ss"; |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private IProjectxService iProjectxService; |
|
|
|
private IProjectxService iProjectxService; |
|
|
@ -94,8 +95,8 @@ public class TaskController extends JeecgController<Task, ITaskService> { |
|
|
|
} |
|
|
|
} |
|
|
|
IPage<Task> pageList = taskService.page(page, queryWrapper); |
|
|
|
IPage<Task> pageList = taskService.page(page, queryWrapper); |
|
|
|
pageList.getRecords().stream().forEach(e -> { |
|
|
|
pageList.getRecords().stream().forEach(e -> { |
|
|
|
String startDate = DateUtils.date2Str(e.getStartTime(), new SimpleDateFormat("yyyy/MM/dd hh:mm:ss")); |
|
|
|
String startDate = DateUtils.date2Str(e.getStartTime(), new SimpleDateFormat(FORMAT)); |
|
|
|
String endDate = DateUtils.date2Str(e.getExpectedEndTime(), new SimpleDateFormat("yyyy/MM/dd hh:mm:ss")); |
|
|
|
String endDate = DateUtils.date2Str(e.getExpectedEndTime(), new SimpleDateFormat(FORMAT)); |
|
|
|
String startEndTime = startDate + "-" + endDate; |
|
|
|
String startEndTime = startDate + "-" + endDate; |
|
|
|
e.setStartEndTime(startEndTime); |
|
|
|
e.setStartEndTime(startEndTime); |
|
|
|
Projectx projectx = iProjectxService.getById(e.getProjectId()); |
|
|
|
Projectx projectx = iProjectxService.getById(e.getProjectId()); |
|
|
|