jiangjiazhi / regional-platform | GitLab

Commit aa5f8ca188a50c8a0cd2e0fa5057690085cf1032

Authored by liquanyu over 5 years ago

1 parent 46c8b7a97d

Exists in master and in 6 other branches

update

Showing 2 changed files with 15 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PreEugenicsBaseListRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java

...	...	@@ -57,6 +57,15 @@
57	57	private String area;
58	58	private String street;
59	59
	60	+ private Integer sendCountry;
	61	+
	62	+ public Integer getSendCountry() {
	63	+ return sendCountry;
	64	+ }
	65	+
	66	+ public void setSendCountry(Integer sendCountry) {
	67	+ this.sendCountry = sendCountry;
	68	+ }
60	69
61	70	public String getSearchType() {
62	71	return searchType;

...	...	@@ -279,6 +279,12 @@
279	279	if (StringUtils.isNotEmpty(createUser)) {
280	280	query.addCriteria(Criteria.where("createUser").is(createUser));
281	281	}
	282	+
	283	+ Integer sendCountry = param.getSendCountry();
	284	+ if (sendCountry != null) {
	285	+ query.addCriteria(Criteria.where("sendCountry").is(sendCountry));
	286	+ }
	287	+
282	288	String createTime = param.getCreateTime();
283	289	if (StringUtils.isNotEmpty(createTime)) {
284	290	String[] arrs = createTime.split(" - ");