wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
wangshuai 2024-07-27 18:15:59 +08:00
parent 469437e880 c2c207b53d
commit a757e46e5d
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreDayHistoryInfoController.java
View File

@ -63,9 +63,9 @@ public class BusStoreDayHistoryInfoController extends BaseController
@GetMapping("/list1") @GetMapping("/list1")
public TableDataInfo list1(String account, String expStartTime, String expEndTime) public TableDataInfo list1(String account, String expStartTime, String expEndTime)
{ {
startPage(); // startPage();
List<BusOverviewInfo> list = busStoreDayHistoryInfoService.selectBusStoreDayHistoryInfoList1(account, expStartTime,expEndTime); TableDataInfo list = busStoreDayHistoryInfoService.selectBusStoreDayHistoryInfoList1(account, expStartTime,expEndTime);
return getDataTable(list); return list;
} }
@PostMapping("/export") @PostMapping("/export")

3
ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreDayHistoryInfoService.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.business.service;
import com.ruoyi.business.domain.BusOverviewInfo; import com.ruoyi.business.domain.BusOverviewInfo;
import com.ruoyi.business.domain.BusStoreDayHistoryInfo; import com.ruoyi.business.domain.BusStoreDayHistoryInfo;
import com.ruoyi.business.domain.BusStoreExcelInfo; import com.ruoyi.business.domain.BusStoreExcelInfo;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List; import java.util.List;
@ -29,7 +30,7 @@ public interface IBusStoreDayHistoryInfoService
* @return 店铺单日信息集合 * @return 店铺单日信息集合
*/ */
public List<BusStoreExcelInfo> selectBusStoreDayHistoryInfoList(BusStoreExcelInfo busStoreExcelInfo); public List<BusStoreExcelInfo> selectBusStoreDayHistoryInfoList(BusStoreExcelInfo busStoreExcelInfo);
public List<BusOverviewInfo> selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime); public TableDataInfo selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime);
/** /**
* 新增店铺单日信息 * 新增店铺单日信息

14
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreDayHistoryInfoServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.business.service.impl; package com.ruoyi.business.service.impl;
import com.github.pagehelper.PageInfo;
import com.ruoyi.business.domain.*; import com.ruoyi.business.domain.*;
import com.ruoyi.business.mapper.BusAgentInfoMapper; import com.ruoyi.business.mapper.BusAgentInfoMapper;
import com.ruoyi.business.mapper.BusStoreDayHistoryInfoMapper; 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.mapper.BusStoreInfoMapper;
import com.ruoyi.business.service.IBusStoreDayHistoryInfoService; import com.ruoyi.business.service.IBusStoreDayHistoryInfoService;
import com.ruoyi.business.service.IBusStoreDayInfoService; 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.DateUtils;
import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
@ -74,13 +77,19 @@ public class BusStoreDayHistoryInfoServiceImpl implements IBusStoreDayHistoryInf
} }
@Override @Override
public List<BusOverviewInfo> selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime) { public TableDataInfo selectBusStoreDayHistoryInfoList1(String account, String expStartTime, String expEndTime) {
PageUtils.startPage();
BusAgentInfo agentInfo = new BusAgentInfo(); BusAgentInfo agentInfo = new BusAgentInfo();
agentInfo.setDelStatus("1"); agentInfo.setDelStatus("1");
if (StringUtils.isNotEmpty(account)) { if (StringUtils.isNotEmpty(account)) {
agentInfo.setAgentAccount(account); agentInfo.setAgentAccount(account);
} }
List<BusAgentInfo> agentInfoList = agentInfoMapper.selectBusAgentInfoList(agentInfo); List<BusAgentInfo> agentInfoList = agentInfoMapper.selectBusAgentInfoList(agentInfo);
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(HttpStatus.SUCCESS);
rspData.setMsg("查询成功");
rspData.setRows(agentInfoList);
rspData.setTotal(new PageInfo(agentInfoList).getTotal());
List<BusOverviewInfo> data = new ArrayList<>(); List<BusOverviewInfo> data = new ArrayList<>();
for (BusAgentInfo info : agentInfoList) { for (BusAgentInfo info : agentInfoList) {
BusOverviewInfo overviewInfo = new BusOverviewInfo(); BusOverviewInfo overviewInfo = new BusOverviewInfo();
@ -146,7 +155,8 @@ public class BusStoreDayHistoryInfoServiceImpl implements IBusStoreDayHistoryInf
data.add(overviewInfo); data.add(overviewInfo);
} }
return data; rspData.setRows(data);
return rspData;
} }
/** /**