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 8e71f34..460623a 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 @@ -46,6 +46,11 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private Integer contactReason; /** + * 访视状态(1-待访视、2-已访视) + */ + private Integer visitStatus; + + /** * 访视结果(1-成功、2-失败) */ private Integer visitResult; @@ -59,6 +64,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery */ private String matFollowId; + public Integer getVisitStatus() { + return visitStatus; + } + + public void setVisitStatus(Integer visitStatus) { + this.visitStatus = visitStatus; + } + public Integer getContactResult() { return contactResult; } @@ -217,6 +230,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery if (null != contactReason) { condition = condition.and("contactReason", contactReason, MongoOper.IS); } + if (null != visitStatus) { + condition = condition.and("visitStatus", visitStatus, MongoOper.IS); + } if (null != visitResult) { condition = condition.and("visitResult", visitResult, 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 fd17def..99523dd 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 @@ -1223,6 +1223,7 @@ public class MatDeliverFacade { matDeliverQuery.setVisitResult(matdeliverFollowRequest.getVisitResult()); matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm()); + matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus()); matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); matDeliverQuery.setNeed("need"); 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 b805978..bcf9bf3 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 @@ -51,7 +51,10 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ * 预约失败理由(1-无人接听电话、2-拒绝访视、3-其他) */ private Integer contactReason; - + /** + * 访视状态(1-待访视、2-已访视) + */ + private Integer visitStatus; /** * 访视结果(1-成功、2-失败) */ @@ -61,6 +64,14 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{ */ private Integer visitAffirm; + public Integer getVisitStatus() { + return visitStatus; + } + + public void setVisitStatus(Integer visitStatus) { + this.visitStatus = visitStatus; + } + public Integer getOperatorId() { return operatorId; }