From 33a6a3deb07a08d200bec32eeee9b12504c5008b Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 30 十二月 2024 10:01:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java index c322807..fe3df53 100644 --- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java +++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; @@ -56,6 +57,10 @@ @ApiOperation(value = "订单售后列表") @PostMapping(value = "/pageList") public ApiResult<PageInfo<TOrderAftersalesVO>> pageList(@RequestBody TOrderAftersalesQuery query) { + if (StringUtils.hasLength(query.getStartTime())){ + query.setStartTime(query.getStartTime()+" 00:00:00"); + query.setEndTime(query.getEndTime()+" 23:59:59"); + } PageInfo<TOrderAftersalesVO> orderAftersalesVOPageInfo = orderAftersalesService.pageList(query); return ApiResult.success(orderAftersalesVOPageInfo); } -- Gitblit v1.7.1