jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 22 additions and 0 deletions

...	...	@@ -191,7 +191,16 @@
191	191	private String provincePostRestId;
192	192	private String cityPostRestId;
193	193	private String areaPostRestId;
	194	+ private String streetPostRestId;
194	195
	196	+ public String getStreetPostRestId() {
	197	+ return streetPostRestId;
	198	+ }
	199	+
	200	+ public void setStreetPostRestId(String streetPostRestId) {
	201	+ this.streetPostRestId = streetPostRestId;
	202	+ }
	203	+
195	204	public String getProvincePostRestId() {
196	205	return provincePostRestId;
197	206	}
...	...	@@ -421,6 +430,9 @@
421	430	condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS);
422	431	if (null != areaPostRestId) {
423	432	condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS);
	433	+ if (streetPostRestId != null) {
	434	+ condition = condition.and("streetPostRestId", streetPostRestId, MongoOper.IS);
	435	+ }
424	436	}
425	437	}
426	438	}

...	...	@@ -1956,6 +1956,7 @@
1956	1956	matDeliverQuery.setProvincePostRestId(matdeliverFollowRequest.getProvincePostRestId());
1957	1957	matDeliverQuery.setCityPostRestId(matdeliverFollowRequest.getCityPostRestId());
1958	1958	matDeliverQuery.setAreaPostRestId(matdeliverFollowRequest.getAreaPostRestId());
	1959	+ matDeliverQuery.setStreetPostRestId(matdeliverFollowRequest.getStreetPostRestId());
1959	1960
1960	1961	if (matdeliverFollowRequest.getVisitStatus() != null && matdeliverFollowRequest.getVisitStatus() == 2)
1961	1962	{

...	...	@@ -143,9 +143,18 @@
143	143	private String provincePostRestId;
144	144	private String cityPostRestId;
145	145	private String areaPostRestId;
	146	+ private String streetPostRestId;
146	147
147	148	//空表示查询的是原来的追访模式，即根据建档选择的访视机构来访视，1，市， 2 区
148	149	private Integer flag;
	150	+
	151	+ public String getStreetPostRestId() {
	152	+ return streetPostRestId;
	153	+ }
	154	+
	155	+ public void setStreetPostRestId(String streetPostRestId) {
	156	+ this.streetPostRestId = streetPostRestId;
	157	+ }
149	158
150	159	public String getProvincePostRestId() {
151	160	return provincePostRestId;