From c945c7ee716c58300eb049b52a31e398456bc42f Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 14 Mar 2024 13:17:25 +0800 Subject: [PATCH] =?UTF-8?q?0412=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heai/modules/board/entity/ViewKanbanCODelNotifyData.java | 4 ++-- .../com/heai/modules/board/service/impl/BoardServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java b/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java index 06934ea..149e7f6 100644 --- a/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java +++ b/src/main/java/com/heai/modules/board/entity/ViewKanbanCODelNotifyData.java @@ -49,8 +49,8 @@ public class ViewKanbanCODelNotifyData { private Date planShipDate; private String customerPONo; private String delNotifyNo; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date enteredDate; /** * diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java index db1e93e..723712e 100644 --- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java +++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java @@ -43,7 +43,7 @@ public class BoardServiceImpl implements BoardService { String day1= DateUtil.getStringDate(WeekUtil.getFirstDayOfWeek(year,week)); // String day2=DateUtil.getStringDate(WeekUtil.getLastDayOfWeek(year,week)); String day2=DateUtil.getStringDate(DateUtil.getAddDate(WeekUtil.getLastDayOfWeek(year,week),21)); - List list =boardMapper.getWeekShipmentBoardData(null,day2); + List list =boardMapper.getWeekShipmentBoardData(null,null); double number=list.size(); int maxPage=(int)Math.ceil(number/18); if(pageIndex>maxPage){