| | |
| | | |
| | | @GetMapping("/station/list") |
| | | @ApiOperation(value = "查询我的集货站列表") |
| | | public ResponseEntity<ReturnDataDTO<List<StationStatisticDTO>>> statisticStationList(String name){ |
| | | LocalDateTime now = LocalDateTime.now(); |
| | | LocalDateTime towAm = LocalDate.now().atTime(2, 0, 0); |
| | | LocalDateTime fivePm = LocalDate.now().atTime(17, 0, 0); |
| | | public ResponseEntity<ReturnDataDTO<List<StationStatisticDTO>>> statisticStationList(String name |
| | | , String status, String date){ |
| | | /*if(StringUtils.isEmpty(date)){ |
| | | throw new ValidationException("请选择日期"); |
| | | }*/ |
| | | LocalDateTime startDate; |
| | | LocalDateTime endDate; |
| | | if(now.isAfter(towAm)){ |
| | | startDate = fivePm.plusDays(-1); |
| | | endDate = fivePm; |
| | | LocalDate localDate = deliveryOrderService.parseLocalDate(date); |
| | | if(localDate != null){ |
| | | endDate = localDate.atTime(17, 0, 0); |
| | | startDate = endDate.plusDays(-1); |
| | | } else { |
| | | startDate = fivePm.plusDays(-2); |
| | | endDate = fivePm.plusDays(-1); |
| | | LocalDateTime now = LocalDateTime.now(); |
| | | LocalDateTime towAm = LocalDate.now().atTime(2, 0, 0); |
| | | LocalDateTime fivePm = LocalDate.now().atTime(17, 0, 0); |
| | | if(now.isAfter(towAm)){ |
| | | startDate = fivePm.plusDays(-1); |
| | | endDate = fivePm; |
| | | } else { |
| | | startDate = fivePm.plusDays(-2); |
| | | endDate = fivePm.plusDays(-1); |
| | | } |
| | | } |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.statisticStationList(name,startDate,endDate)); |
| | | |
| | | return returnData(R.SUCCESS.getCode(), deliveryOrderService.statisticStationList(name, startDate, endDate, status)); |
| | | } |
| | | |
| | | |