From c2c207b53d0cf052e01b57cbaab27c0bd487fa69 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Sat, 27 Jul 2024 17:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A6=82=E8=A7=88=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusStoreDayHistoryInfoController.java | 6 +++--- .../service/IBusStoreDayHistoryInfoService.java | 3 ++- .../impl/BusStoreDayHistoryInfoServiceImpl.java | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java index 814551b..96ca371 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java @@ -63,9 +63,9 @@ public class BusStoreDayHistoryInfoController extends BaseController @GetMapping("/list1") public TableDataInfo list1(String account, String expStartTime, String expEndTime) { - startPage(); - List list = busStoreDayHistoryInfoService.selectBusStoreDayHistoryInfoList1(account, expStartTime,expEndTime); - return getDataTable(list); +// startPage(); + TableDataInfo list = busStoreDayHistoryInfoService.selectBusStoreDayHistoryInfoList1(account, expStartTime,expEndTime); + return list; } @PostMapping("/export") diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreDayHistoryInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreDayHistoryInfoService.java index d334421..eba9b4f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreDayHistoryInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreDayHistoryInfoService.java @@ -3,6 +3,7 @@ package com.ruoyi.business.service; import com.ruoyi.business.domain.BusOverviewInfo; import com.ruoyi.business.domain.BusStoreDayHistoryInfo; import com.ruoyi.business.domain.BusStoreExcelInfo; +import com.ruoyi.common.core.page.TableDataInfo; import java.util.List; @@ -29,7 +30,7 @@ public interface IBusStoreDayHistoryInfoService * @return 店铺单日信息集合 */ public List selectBusStoreDayHistoryInfoList(BusStoreExcelInfo busStoreExcelInfo); - public List selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime); + public TableDataInfo selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime); /** * 新增店铺单日信息 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreDayHistoryInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreDayHistoryInfoServiceImpl.java index 2eefc52..aaaaffb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreDayHistoryInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreDayHistoryInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.business.service.impl; +import com.github.pagehelper.PageInfo; import com.ruoyi.business.domain.*; import com.ruoyi.business.mapper.BusAgentInfoMapper; import com.ruoyi.business.mapper.BusStoreDayHistoryInfoMapper; @@ -7,6 +8,8 @@ import com.ruoyi.business.mapper.BusStoreDayInfoMapper; import com.ruoyi.business.mapper.BusStoreInfoMapper; import com.ruoyi.business.service.IBusStoreDayHistoryInfoService; import com.ruoyi.business.service.IBusStoreDayInfoService; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; @@ -74,13 +77,19 @@ public class BusStoreDayHistoryInfoServiceImpl implements IBusStoreDayHistoryInf } @Override - public List selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime) { + public TableDataInfo selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime) { + PageUtils.startPage(); BusAgentInfo agentInfo = new BusAgentInfo(); agentInfo.setDelStatus("1"); if (StringUtils.isNotEmpty(account)) { agentInfo.setAgentAccount(account); } List agentInfoList = agentInfoMapper.selectBusAgentInfoList(agentInfo); + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(HttpStatus.SUCCESS); + rspData.setMsg("查询成功"); + rspData.setRows(agentInfoList); + rspData.setTotal(new PageInfo(agentInfoList).getTotal()); List data = new ArrayList<>(); for (BusAgentInfo info : agentInfoList) { BusOverviewInfo overviewInfo = new BusOverviewInfo(); @@ -146,7 +155,8 @@ public class BusStoreDayHistoryInfoServiceImpl implements IBusStoreDayHistoryInf data.add(overviewInfo); } - return data; + rspData.setRows(data); + return rspData; } /**