jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 43 additions and 3 deletions

...	...	@@ -196,6 +196,18 @@
196	196	//0 或者空不是 1是
197	197	private Integer hasHj;
198	198
	199	+ //婚检时间
	200	+ private Date checkupTime;
	201	+
	202	+ public Date getCheckupTime() {
	203	+ return checkupTime;
	204	+ }
	205	+
	206	+ public ResidentsArchiveModel setCheckupTime(Date checkupTime) {
	207	+ this.checkupTime = checkupTime;
	208	+ return this;
	209	+ }
	210	+
199	211	public Integer getHasHj() {
200	212	return hasHj;
201	213	}

...	...	@@ -138,9 +138,11 @@
138	138
139	139	//配偶证件号
140	140	private String spouseCardNo;
	141	+ //婚检时间
	142	+ private Date checkupTimeStart;
	143	+ private Date checkupTimeEnd;
141	144
142	145
143		-
144	146	@Override
145	147	public MongoQuery convertToQuery() {
146	148	MongoCondition condition = MongoCondition.newInstance();
147	149
...	...	@@ -265,7 +267,15 @@
265	267	}
266	268	}
267	269
	270	+ if (null != checkupTimeStart && null != checkupTimeEnd) {
	271	+ if (null != c1) {
	272	+ c1 = c1.where("checkupTime").gte(checkupTimeStart).lte(checkupTimeEnd);
	273	+ } else {
	274	+ c1 = Criteria.where("checkupTime").gte(checkupTimeStart).lte(checkupTimeEnd);
	275	+ }
	276	+ }
268	277
	278	+
269	279	if (null != createdStart && null != createdEnd) {
270	280	if (null != c1) {
271	281	c1 = c1.where("created").gte(createdStart).lte(createdEnd);
...	...	@@ -336,6 +346,24 @@
336	346
337	347	//0 或者空不是 1是
338	348	private Integer hasHj;
	349	+
	350	+ public Date getCheckupTimeStart() {
	351	+ return checkupTimeStart;
	352	+ }
	353	+
	354	+ public ResidentsArchiveQuery setCheckupTimeStart(Date checkupTimeStart) {
	355	+ this.checkupTimeStart = checkupTimeStart;
	356	+ return this;
	357	+ }
	358	+
	359	+ public Date getCheckupTimeEnd() {
	360	+ return checkupTimeEnd;
	361	+ }
	362	+
	363	+ public ResidentsArchiveQuery setCheckupTimeEnd(Date checkupTimeEnd) {
	364	+ this.checkupTimeEnd = checkupTimeEnd;
	365	+ return this;
	366	+ }
339	367
340	368	public Integer getHasHj() {
341	369	return hasHj;

...	...	@@ -610,8 +610,8 @@
610	610	}
611	611	if (StringUtils.isNotEmpty(time)) {
612	612	try {
613		- query.setBuildDateStart(DateUtil.getSNDate(time)[0]);
614		- query.setBuildDateEnd(DateUtil.getSNDate(time)[1]);
	613	+ query.setCheckupTimeStart(DateUtil.getSNDate(time)[0]);
	614	+ query.setCheckupTimeEnd(DateUtil.getSNDate(time)[1]);
615	615	} catch (Exception e) {
616	616	e.printStackTrace();
617	617	}