|
@@ -56,9 +56,10 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
|
|
|
public Page<InventoryBackupVo> getPage(InventorySelectDto dto) {
|
|
|
|
|
|
IWrapper<InventoryBackup> wrapper = getWrapper();
|
|
|
- wrapper.orderByDesc("ib", InventoryBackup::getId);
|
|
|
wrapper.ge("ib", InventoryBackup::getBackupDate, dto.getBeginTime());
|
|
|
wrapper.le("ib", InventoryBackup::getBackupDate, dto.getEndTime());
|
|
|
+ wrapper.orderByDesc("ib", InventoryBackup::getId);
|
|
|
+ wrapper.groupBy("ib.backup_date");
|
|
|
|
|
|
Page<InventoryBackupVo> page = baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
List<InventoryBackupVo> records = page.getRecords();
|
|
@@ -67,8 +68,8 @@ public class InventoryBackupServiceImpl extends ServiceImpl<InventoryBackupMappe
|
|
|
}
|
|
|
|
|
|
for (InventoryBackupVo record : records) {
|
|
|
- record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
|
|
|
record.setBackupDateStr(DateUtil.format(record.getBackupDate(), "yyyy-MM-dd"));
|
|
|
+ record.setBackupDate(DateUtil.offsetDay(record.getBackupDate(), 1));
|
|
|
}
|
|
|
return page;
|
|
|
}
|