luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

刷卡-灌溉逻辑+修改灌溉记录和充值记录的导出接口

Browse Source
This commit is contained in:
童丽然
2024-12-31 18:26:05 +08:00
parent aba6f51ea7
commit b5f1ec63d0
8 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java
View File

@ -65,9 +65,10 @@ public class NgUserRechargeRecordsController extends BaseController
@ApiOperation("导出用户充值记录列表")
// @PreAuthorize("@ss.hasPermi('rechargecard:records:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, NgUserRechargeRecords ngUserRechargeRecords)
public void export(HttpServletResponse response, NgUserRechargeRecordsDto ngUserRechargeRecords)
{
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
// List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords);
ExcelUtil<NgUserRechargeRecords> util = new ExcelUtil<NgUserRechargeRecords>(NgUserRechargeRecords.class);
util.exportExcel(response, list, "用户充值记录数据");
}

11
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserIrrigationRecordController.java
View File

@ -3,8 +3,10 @@ package com.fastbee.data.controller.userRecharge;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.fastbee.common.core.domain.entity.SysUser;
import com.fastbee.rechargecard.domain.UserConsumptionDetails;
import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordDto;
import com.fastbee.rechargecard.domain.dto.UserIrrigationRecordListDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -46,10 +48,10 @@ public class UserIrrigationRecordController extends BaseController
// @PreAuthorize("@ss.hasPermi('rechargecard:record:list')")
@GetMapping("/list")
@ApiOperation("查询灌溉记录列表")
public TableDataInfo list(UserIrrigationRecord userIrrigationRecord)
public TableDataInfo list(UserIrrigationRecordListDto userIrrigationRecord)
{
startPage();
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord);
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
return getDataTable(list);
}
@ -110,9 +112,10 @@ public class UserIrrigationRecordController extends BaseController
@ApiOperation("导出灌溉记录列表")
// @PreAuthorize("@ss.hasPermi('rechargecard:record:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, UserIrrigationRecord userIrrigationRecord)
public void export(HttpServletResponse response, UserIrrigationRecordListDto userIrrigationRecord)
{
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord);
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
//List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord);
ExcelUtil<UserIrrigationRecord> util = new ExcelUtil<UserIrrigationRecord>(UserIrrigationRecord.class);
util.exportExcel(response, list, "灌溉记录数据");
}