jiangjiazhi / regional-platform | GitLab

Commit 339e264ccabf25094cbe1c2d4323aa278bc46114

Authored by liquanyu over 5 years ago

1 parent ff1a4c7063

Exists in master and in 6 other branches

update

Showing 2 changed files with 16 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

...	...	@@ -59,6 +59,17 @@
59	59
60	60	private Integer sendCountry;
61	61
	62	+ //是否有B超
	63	+ private Boolean hasBc;
	64	+
	65	+ public Boolean getHasBc() {
	66	+ return hasBc;
	67	+ }
	68	+
	69	+ public void setHasBc(Boolean hasBc) {
	70	+ this.hasBc = hasBc;
	71	+ }
	72	+
62	73	public Integer getSendCountry() {
63	74	return sendCountry;
64	75	}

...	...	@@ -285,6 +285,11 @@
285	285	query.addCriteria(Criteria.where("sendCountry").is(sendCountry));
286	286	}
287	287
	288	+ Boolean hasBc = param.getHasBc();
	289	+ if (hasBc != null) {
	290	+ query.addCriteria(Criteria.where("wifeBCheck").exists(hasBc));
	291	+ }
	292	+
288	293	String createTime = param.getCreateTime();
289	294	if (StringUtils.isNotEmpty(createTime)) {
290	295	String[] arrs = createTime.split(" - ");