liquanyu / regional-platform | GitLab

Commit be6b7aa46da096372918ff444554b2a15fb65f6f

Authored by landong2015 almost 9 years ago

1 parent 41d63a59a8

Exists in master and in 3 other branches

update

Showing 3 changed files with 12 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java

...	...	@@ -140,6 +140,15 @@
140	140	if (StringUtils.isNotBlank(areaId)) {
141	141	condition = condition.and("areaId", areaId, MongoOper.IS);
142	142	}
	143	+ if (StringUtils.isNotBlank(provinceRegisterId)) {
	144	+ condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
	145	+ }
	146	+ if (StringUtils.isNotBlank(cityRegisterId)) {
	147	+ condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS);
	148	+ }
	149	+ if (StringUtils.isNotBlank(areaRegisterId)) {
	150	+ condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
	151	+ }
143	152	if (StringUtils.isNotBlank(vcCardNo)) {
144	153	condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
145	154	}

...	...	@@ -191,7 +191,7 @@
191	191	list.add(map);
192	192	}
193	193	}
194		- return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list);
	194	+ return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list).setPageInfo(query.getPageInfo());
195	195	}
196	196
197	197	//查询孕次

...	...	@@ -40,9 +40,9 @@
40	40	private String cityRegisterId;
41	41	private String areaRegisterId;
42	42
43		- //年龄(如: 24-26)
	43	+ //年龄(如: 24 - 26)
44	44	private String age;
45		- //出生日期(范围值 - )
	45	+ //出生日期(范围值 1991-01-01 - 1994-02-02 )
46	46	private String birthday;
47	47
48	48	public String getBuildProvinceId() {