diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java index b0bcf94..27e08ad 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java @@ -53,6 +53,7 @@ public class TaskController extends JeecgController { private ITaskService taskService; private static final String ADMIN = "admin"; + private static final String FORMAT = "yyyy/MM/dd HH:mm:ss"; @Resource private IProjectxService iProjectxService; @@ -94,8 +95,8 @@ public class TaskController extends JeecgController { } IPage pageList = taskService.page(page, queryWrapper); pageList.getRecords().stream().forEach(e -> { - String startDate = DateUtils.date2Str(e.getStartTime(), new SimpleDateFormat("yyyy/MM/dd hh:mm:ss")); - String endDate = DateUtils.date2Str(e.getExpectedEndTime(), 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(FORMAT)); String startEndTime = startDate + "-" + endDate; e.setStartEndTime(startEndTime); Projectx projectx = iProjectxService.getById(e.getProjectId());