Commit c73353838b73abc0bf43ccb55ac61afe4109086d
1 parent
ba038d18f5
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 15 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
View file @
c733538
| ... | ... | @@ -315,7 +315,12 @@ |
| 315 | 315 | public void healthManagerDetailExport(HealthManagerListRequest param, HttpServletRequest request, HttpServletResponse response){ |
| 316 | 316 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 317 | 317 | param.setUserId(loginState.getId()); |
| 318 | - checkDate(param); | |
| 318 | + Date endTime = param.getEndTime(); | |
| 319 | + if (null != endTime) { | |
| 320 | + Date endDate = getTodayEndDate(endTime, false); | |
| 321 | + param.setEndTime(endDate); | |
| 322 | + } | |
| 323 | + //checkDate(param); | |
| 319 | 324 | try { |
| 320 | 325 | areaCountFacade.healthManagerDetailExport(param, response); |
| 321 | 326 | }catch (Exception e){ |
| ... | ... | @@ -337,7 +342,7 @@ |
| 337 | 342 | if (startTime != null && endTime != null){ |
| 338 | 343 | param.setStartTime(new Date(startTime.getTime() - 28800000)); |
| 339 | 344 | // 結束時間 |
| 340 | - Date time = getTodayEndDate(endTime); | |
| 345 | + Date time = getTodayEndDate(endTime, true); | |
| 341 | 346 | param.setEndTime(time); |
| 342 | 347 | } |
| 343 | 348 | } |
| ... | ... | @@ -348,7 +353,7 @@ |
| 348 | 353 | if (startTime != null && endTime != null){ |
| 349 | 354 | param.setStartTime(new Date(startTime.getTime() - 28800000)); |
| 350 | 355 | // 結束時間 |
| 351 | - Date time = getTodayEndDate(endTime); | |
| 356 | + Date time = getTodayEndDate(endTime, true); | |
| 352 | 357 | param.setEndTime(time); |
| 353 | 358 | } |
| 354 | 359 | } |
| 355 | 360 | |
| ... | ... | @@ -360,9 +365,14 @@ |
| 360 | 365 | * @param endTime |
| 361 | 366 | * @return |
| 362 | 367 | */ |
| 363 | - private Date getTodayEndDate(Date endTime) { | |
| 368 | + private Date getTodayEndDate(Date endTime, boolean isGMT) { | |
| 364 | 369 | Calendar todayEnd = Calendar.getInstance(); |
| 365 | - todayEnd.setTime(new Date(endTime.getTime() - 28800000)); | |
| 370 | + if (isGMT) { | |
| 371 | + todayEnd.setTime(new Date(endTime.getTime() - 28800000)); | |
| 372 | + } | |
| 373 | + if (!isGMT) { | |
| 374 | + todayEnd.setTime(new Date(endTime.getTime())); | |
| 375 | + } | |
| 366 | 376 | todayEnd.set(Calendar.HOUR_OF_DAY, 23); |
| 367 | 377 | todayEnd.set(Calendar.MINUTE, 59); |
| 368 | 378 | todayEnd.set(Calendar.SECOND, 59); |