|
|
@@ -77,7 +77,10 @@ public class ListCarInoutPaymentSummaryCmd extends Cmd {
|
|
|
carInoutPaymentDto.setStartTime(DateUtil.getFormatTimeString(calendar.getTime(),DateUtil.DATE_FORMATE_STRING_B));
|
|
|
}
|
|
|
if(StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
|
|
|
- carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B));
|
|
|
+ carInoutPaymentDto.setEndTime(DateUtil.getFormatTimeString(new Date(),DateUtil.DATE_FORMATE_STRING_B) + " 23:59:59");
|
|
|
+ }else{
|
|
|
+ Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
|
|
|
+ carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
|
|
|
}
|
|
|
List<CarInoutPaymentDto> carInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentSummary(carInoutPaymentDto);
|
|
|
|