From e5a8ba7ed198bd615e2e6d9cb50cdff99913f345 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 11 Aug 2020 14:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E4=B8=AD=E4=BA=A7=E5=90=8E?= =?UTF-8?q?=E4=BF=AE=E5=85=BB=E5=9C=B0=E6=B7=BB=E5=8A=A0=E8=A1=97=E9=81=93?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/MatDeliverQuery.java | 12 ++++++++++++ .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 1 + .../operate/web/request/MatdeliverFollowRequest.java | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 12e33c7..8b98422 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -191,6 +191,15 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String provincePostRestId; private String cityPostRestId; private String areaPostRestId; + private String streetPostRestId; + + public String getStreetPostRestId() { + return streetPostRestId; + } + + public void setStreetPostRestId(String streetPostRestId) { + this.streetPostRestId = streetPostRestId; + } public String getProvincePostRestId() { return provincePostRestId; @@ -421,6 +430,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS); if (null != areaPostRestId) { condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS); + if (streetPostRestId != null) { + condition = condition.and("streetPostRestId", streetPostRestId, MongoOper.IS); + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4514efc..caafedb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1956,6 +1956,7 @@ public class MatDeliverFacade { matDeliverQuery.setProvincePostRestId(matdeliverFollowRequest.getProvincePostRestId()); matDeliverQuery.setCityPostRestId(matdeliverFollowRequest.getCityPostRestId()); matDeliverQuery.setAreaPostRestId(matdeliverFollowRequest.getAreaPostRestId()); + matDeliverQuery.setStreetPostRestId(matdeliverFollowRequest.getStreetPostRestId()); if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 2) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java index 92b9991..e02df5f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java @@ -143,10 +143,19 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ private String provincePostRestId; private String cityPostRestId; private String areaPostRestId; + private String streetPostRestId; //空表示查询的是原来的追访模式，即根据建档选择的访视机构来访视，1，市， 2 区 private Integer flag; + public String getStreetPostRestId() { + return streetPostRestId; + } + + public void setStreetPostRestId(String streetPostRestId) { + this.streetPostRestId = streetPostRestId; + } + public String getProvincePostRestId() { return provincePostRestId; } -- 1.8.3.1