From b3e8b257499283e7847d97700cee9c29de383530 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 27 Apr 2020 14:30:59 +0800 Subject: [PATCH] update --- .../platform/operate/web/controller/TrackDownController.java | 11 +++++++++++ .../platform/operate/web/request/TrackDownQueryRequest.java | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 3c3eb5b..e6613f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -139,6 +139,17 @@ public class TrackDownController extends BaseController { @TokenRequired @RequestMapping(method = RequestMethod.GET) public BaseResponse list(TrackDownQueryRequest downQueryRequest, HttpServletRequest request) { + + if (downQueryRequest.getBeOverdueDaysEnd() != null && downQueryRequest.getBeOverdueDaysStart() == null) + { + downQueryRequest.setBeOverdueDaysStart(1); + } + + if (downQueryRequest.getCheckOverDaysEnd() != null && downQueryRequest.getCheckOverDaysStart() == null) + { + downQueryRequest.setCheckOverDaysStart(1); + } + return downFacade.list(downQueryRequest, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java index 4305e50..6e1a3cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java @@ -114,10 +114,6 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { } public void setCheckOverDaysEnd(Integer checkOverDaysEnd) { - if (checkOverDaysStart == null) - { - checkOverDaysStart = 1; - } this.checkOverDaysEnd = checkOverDaysEnd; } @@ -134,10 +130,6 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { } public void setBeOverdueDaysEnd(Integer beOverdueDaysEnd) { - if (beOverdueDaysStart == null) - { - beOverdueDaysStart = 1; - } this.beOverdueDaysEnd = beOverdueDaysEnd; } -- 1.8.3.1