From 0ff06d67012be351d9616b5e635db17f589eb298 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 5 Aug 2020 16:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=B1=E8=AE=BF=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E5=88=97=E9=80=BE=E6=9C=9F=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=A4=A9=E6=95=B0=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/request/BabyAfterVisitBuildListRequest.java | 21 +++++++++++++++++++++ .../web/service/impl/BabyAfterVisitServiceImpl.java | 10 +++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAfterVisitBuildListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAfterVisitBuildListRequest.java index 4696502..58877c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAfterVisitBuildListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAfterVisitBuildListRequest.java @@ -46,6 +46,11 @@ public class BabyAfterVisitBuildListRequest extends BaseQuery implements Seriali */ private Integer beyondDay; + + private Integer startBeyondDay; + + private Integer endBeyondDay; + /** * 追访结果 */ @@ -98,6 +103,22 @@ public class BabyAfterVisitBuildListRequest extends BaseQuery implements Seriali */ private String isEncrypt = "2"; + public Integer getEndBeyondDay() { + return endBeyondDay; + } + + public void setEndBeyondDay(Integer endBeyondDay) { + this.endBeyondDay = endBeyondDay; + } + + public Integer getStartBeyondDay() { + return startBeyondDay; + } + + public void setStartBeyondDay(Integer startBeyondDay) { + this.startBeyondDay = startBeyondDay; + } + public String getIsEncrypt() { return isEncrypt; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 780d4ac..567ac98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -318,7 +318,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { boolean appointmentTimeBoolean = StringUtils.isNotEmpty(startAppointmentTime) && StringUtils.isNotEmpty(endAppointmentTime); // 逾期天数 - Integer beyondDay = request.getBeyondDay(); + Integer beyondDay = request.getStartBeyondDay(); boolean nonNull = beyondDay != null; if (appointmentTimeBoolean && nonNull) { startAppointmentTime += " 00:00:00"; @@ -333,8 +333,8 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { e2 = getEndDateByLtZero(beyondDay); s2 = getStartDateByLtZero(beyondDay); } else { - e2 = getEndDate(beyondDay); - s2 = getStartDate(beyondDay); + e2 = getEndDate(request.getStartBeyondDay()); + s2 = getStartDate(request.getEndBeyondDay()); } if (s1.before(s2) && s2.before(e1) && e1.before(e2)) { @@ -365,8 +365,8 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { Date start; Date date = new Date(); if (beyondDay > 0) { - end = getEndDate(beyondDay); - start = getStartDate(beyondDay); + end = getEndDate(request.getStartBeyondDay()); + start = getStartDate(request.getEndBeyondDay()); query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end)); } else { // 针对逾期天数为负数 -- 1.8.3.1