liquanyu / regional-platform

Download as
Browse Code »

Commit e05d350a635020ef9e8a35cf239e7067b948a373

Authored by dongqin
1 parent 0e843ae904
Exists in master and in 1 other branch dev

时间处理

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ e05d350
... ... @@ -846,7 +846,7 @@
846 846 String endFmTime = param.getEndFmTime();
847 847 if (StringUtils.isNotEmpty(startFmTime) && StringUtils.isNotEmpty(endFmTime)) {
848 848 Date start = DateUtil.parseYMD(startFmTime);
849   - Date end = DateUtil.parseYMD(endFmTime);
  849 + Date end = DateUtil.parseYMDEnd(endFmTime);
850 850 query.addCriteria(Criteria.where("dueDate").gte(start).lte(end));
851 851 }
852 852  
... ... @@ -855,7 +855,7 @@
855 855 String endSendTime = param.getEndSendTime();
856 856 if (StringUtils.isNotEmpty(startSendTime) && StringUtils.isNotEmpty(endSendTime)) {
857 857 Date start = DateUtil.parseYMD(startSendTime);
858   - Date end = DateUtil.parseYMD(endSendTime);
  858 + Date end = DateUtil.parseYMDEnd(endSendTime);
859 859 query.addCriteria(Criteria.where("sendTime").gte(start).lte(end));
860 860 }
861 861  
... ... @@ -864,7 +864,7 @@
864 864 String endWriteTime = param.getEndWriteTime();
865 865 if (StringUtils.isNotEmpty(startWriteTime) && StringUtils.isNotEmpty(endWriteTime)) {
866 866 Date start = DateUtil.parseYMD(startWriteTime);
867   - Date end = DateUtil.parseYMD(endWriteTime);
  867 + Date end = DateUtil.parseYMDEnd(endWriteTime);
868 868 query.addCriteria(Criteria.where("writeTime").gte(start).lte(end));
869 869 }
870 870  
... ... @@ -873,7 +873,7 @@
873 873 String endConfirmTime = param.getEndConfirmTime();
874 874 if (StringUtils.isNotEmpty(startConfirmTime) && StringUtils.isNotEmpty(endConfirmTime)) {
875 875 Date start = DateUtil.parseYMD(startConfirmTime);
876   - Date end = DateUtil.parseYMD(endConfirmTime);
  876 + Date end = DateUtil.parseYMDEnd(endConfirmTime);
877 877 query.addCriteria(Criteria.where("confirmTime").gte(start).lte(end));
878 878 }
879 879