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

修改灌溉记录和充值记录中的时间搜索逻辑为endTime=endTime+1天以防止想要查询当天记录两个时间参数传值一样的情况

Browse Source
This commit is contained in:
童丽然 2024-12-31 19:07:53 +08:00
parent e62f733f00
commit d6130cf330
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package com.fastbee.data.controller.userRecharge; package com.fastbee.data.controller.userRecharge;
import java.util.Calendar;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -50,6 +52,17 @@ public class NgUserRechargeRecordsController extends BaseController
public TableDataInfo list(NgUserRechargeRecordsDto ngUserRechargeRecords) public TableDataInfo list(NgUserRechargeRecordsDto ngUserRechargeRecords)
{ {
startPage(); startPage();
if(ngUserRechargeRecords.getStartTime()!=null && ngUserRechargeRecords.getEndTime()!=null)
{
//设置结束时间加一天
Date endTime = ngUserRechargeRecords.getEndTime();
// 使用 Calendar 给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(endTime);
calendar.add(Calendar.DATE, 1); // 给日期加一天
// 将计算后的日期设置回 userIrrigationRecord 对象
ngUserRechargeRecords.setEndTime(calendar.getTime());
}
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords); List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords);
//按照充值时间由近到远排序 //按照充值时间由近到远排序
// list.sort(Comparator.comparing(NgUserRechargeRecords::getRechargeTime).reversed()); // list.sort(Comparator.comparing(NgUserRechargeRecords::getRechargeTime).reversed());
@ -67,6 +80,18 @@ public class NgUserRechargeRecordsController extends BaseController
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, NgUserRechargeRecordsDto ngUserRechargeRecords) public void export(HttpServletResponse response, NgUserRechargeRecordsDto ngUserRechargeRecords)
{ {
if(ngUserRechargeRecords.getStartTime()!=null && ngUserRechargeRecords.getEndTime()!=null)
{
//设置结束时间加一天
Date endTime = ngUserRechargeRecords.getEndTime();
// 使用 Calendar 给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(endTime);
calendar.add(Calendar.DATE, 1); // 给日期加一天
// 将计算后的日期设置回 userIrrigationRecord 对象
ngUserRechargeRecords.setEndTime(calendar.getTime());
}
// List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords); // List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsList(ngUserRechargeRecords);
List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords); List<NgUserRechargeRecords> list = ngUserRechargeRecordsService.selectNgUserRechargeRecordsListByTime(ngUserRechargeRecords);
ExcelUtil<NgUserRechargeRecords> util = new ExcelUtil<NgUserRechargeRecords>(NgUserRechargeRecords.class); ExcelUtil<NgUserRechargeRecords> util = new ExcelUtil<NgUserRechargeRecords>(NgUserRechargeRecords.class);

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

@ -1,5 +1,7 @@
package com.fastbee.data.controller.userRecharge; package com.fastbee.data.controller.userRecharge;
import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -51,6 +53,18 @@ public class UserIrrigationRecordController extends BaseController
public TableDataInfo list(UserIrrigationRecordListDto userIrrigationRecord) public TableDataInfo list(UserIrrigationRecordListDto userIrrigationRecord)
{ {
startPage(); startPage();
if(userIrrigationRecord.getSearchEndTime()!=null && userIrrigationRecord.getSearchStartTime()!=null)
{
//设置结束时间加一天
Date searchEndTime = userIrrigationRecord.getSearchEndTime();
// 使用 Calendar 给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(searchEndTime);
calendar.add(Calendar.DATE, 1); // 给日期加一天
// 将计算后的日期设置回 userIrrigationRecord 对象
userIrrigationRecord.setSearchEndTime(calendar.getTime());
}
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord); List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
return getDataTable(list); return getDataTable(list);
} }
@ -114,6 +128,18 @@ public class UserIrrigationRecordController extends BaseController
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, UserIrrigationRecordListDto userIrrigationRecord) public void export(HttpServletResponse response, UserIrrigationRecordListDto userIrrigationRecord)
{ {
if(userIrrigationRecord.getSearchEndTime()!=null && userIrrigationRecord.getSearchStartTime()!=null)
{
//设置结束时间加一天
Date searchEndTime = userIrrigationRecord.getSearchEndTime();
// 使用 Calendar 给日期加一天
Calendar calendar = Calendar.getInstance();
calendar.setTime(searchEndTime);
calendar.add(Calendar.DATE, 1); // 给日期加一天
// 将计算后的日期设置回 userIrrigationRecord 对象
userIrrigationRecord.setSearchEndTime(calendar.getTime());
}
List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord); List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordListByTime(userIrrigationRecord);
//List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord); //List<UserIrrigationRecord> list = userIrrigationRecordService.selectUserIrrigationRecordList(userIrrigationRecord);
ExcelUtil<UserIrrigationRecord> util = new ExcelUtil<UserIrrigationRecord>(UserIrrigationRecord.class); ExcelUtil<UserIrrigationRecord> util = new ExcelUtil<UserIrrigationRecord>(UserIrrigationRecord.class);