0412更新

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;
     /**
      *

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<ViewKanbanCODelNotifyData> list =boardMapper.getWeekShipmentBoardData(null,day2);
+        List<ViewKanbanCODelNotifyData> list =boardMapper.getWeekShipmentBoardData(null,null);
         double number=list.size();
         int maxPage=(int)Math.ceil(number/18);
         if(pageIndex>maxPage){