jiangjiazhi / regional-platform

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 26 additions and 5 deletions

...	...	@@ -46,6 +46,11 @@
46	46	*/
47	47	private Integer beyondDay;
48	48
	49	+
	50	+ private Integer startBeyondDay;
	51	+
	52	+ private Integer endBeyondDay;
	53	+
49	54	/**
50	55	* 追访结果
51	56	*/
...	...	@@ -97,6 +102,22 @@
97	102	* 是否加密 1\|是 2\|否
98	103	*/
99	104	private String isEncrypt = "2";
	105	+
	106	+ public Integer getEndBeyondDay() {
	107	+ return endBeyondDay;
	108	+ }
	109	+
	110	+ public void setEndBeyondDay(Integer endBeyondDay) {
	111	+ this.endBeyondDay = endBeyondDay;
	112	+ }
	113	+
	114	+ public Integer getStartBeyondDay() {
	115	+ return startBeyondDay;
	116	+ }
	117	+
	118	+ public void setStartBeyondDay(Integer startBeyondDay) {
	119	+ this.startBeyondDay = startBeyondDay;
	120	+ }
100	121
101	122	public String getIsEncrypt() {
102	123	return isEncrypt;

...	...	@@ -318,7 +318,7 @@
318	318	boolean appointmentTimeBoolean = StringUtils.isNotEmpty(startAppointmentTime) && StringUtils.isNotEmpty(endAppointmentTime);
319	319
320	320	// 逾期天数
321		- Integer beyondDay = request.getBeyondDay();
	321	+ Integer beyondDay = request.getStartBeyondDay();
322	322	boolean nonNull = beyondDay != null;
323	323	if (appointmentTimeBoolean && nonNull) {
324	324	startAppointmentTime += " 00:00:00";
...	...	@@ -333,8 +333,8 @@
333	333	e2 = getEndDateByLtZero(beyondDay);
334	334	s2 = getStartDateByLtZero(beyondDay);
335	335	} else {
336		- e2 = getEndDate(beyondDay);
337		- s2 = getStartDate(beyondDay);
	336	+ e2 = getEndDate(request.getStartBeyondDay());
	337	+ s2 = getStartDate(request.getEndBeyondDay());
338	338	}
339	339
340	340	if (s1.before(s2) && s2.before(e1) && e1.before(e2)) {
...	...	@@ -365,8 +365,8 @@
365	365	Date start;
366	366	Date date = new Date();
367	367	if (beyondDay > 0) {
368		- end = getEndDate(beyondDay);
369		- start = getStartDate(beyondDay);
	368	+ end = getEndDate(request.getStartBeyondDay());
	369	+ start = getStartDate(request.getEndBeyondDay());
370	370	query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(end));
371	371	} else {
372	372	// 针对逾期天数为负数