liquanyu / regional-platform

Download as
Browse Code »

Commit d9354b11e430bcdebed633d72c7a226657bb5e1a

Authored by dongqin
1 parent f58afc499c
Exists in master and in 1 other branch dev

设置结束时间

Showing 1 changed file with 22 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java View file @ d9354b1
... ... @@ -18,6 +18,7 @@
18 18 import javax.servlet.http.HttpServletRequest;
19 19 import javax.servlet.http.HttpServletResponse;
20 20 import javax.validation.Valid;
  21 +import java.util.Calendar;
21 22 import java.util.Date;
22 23  
23 24 /**
... ... @@ -335,7 +336,9 @@
335 336 Date endTime = param.getEndTime();
336 337 if (startTime != null && endTime != null){
337 338 param.setStartTime(new Date(startTime.getTime() - 28800000));
338   - param.setEndTime(new Date(endTime.getTime() - 28800000));
  339 + // 結束時間
  340 + Date time = getTodayEndDate(endTime);
  341 + param.setEndTime(time);
339 342 }
340 343 }
341 344 if (object instanceof HealthManagerListRequest){
342 345  
... ... @@ -344,9 +347,26 @@
344 347 Date endTime = param.getEndTime();
345 348 if (startTime != null && endTime != null){
346 349 param.setStartTime(new Date(startTime.getTime() - 28800000));
347   - param.setEndTime(new Date(endTime.getTime() - 28800000));
  350 + // 結束時間
  351 + Date time = getTodayEndDate(endTime);
  352 + param.setEndTime(time);
348 353 }
349 354 }
  355 + }
  356 +
  357 + /**
  358 + * 結束時間
  359 + *
  360 + * @param endTime
  361 + * @return
  362 + */
  363 + private Date getTodayEndDate(Date endTime) {
  364 + Calendar todayEnd = Calendar.getInstance();
  365 + todayEnd.setTime(new Date(endTime.getTime() - 28800000));
  366 + todayEnd.set(Calendar.HOUR_OF_DAY, 23);
  367 + todayEnd.set(Calendar.MINUTE, 59);
  368 + todayEnd.set(Calendar.SECOND, 59);
  369 + return todayEnd.getTime();
350 370 }
351 371  
352 372 }