|
@@ -320,13 +320,13 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
public List<GoldSendExcelDTO> excelGoldSendList(GoldSendPage vo) {
|
|
public List<GoldSendExcelDTO> excelGoldSendList(GoldSendPage vo) {
|
|
|
try {
|
|
try {
|
|
|
QueryWrapper queryWrapper = getQueryWrapper(vo);
|
|
QueryWrapper queryWrapper = getQueryWrapper(vo);
|
|
|
- int count = baseMapper.goldSendListSize(queryWrapper,dbName);
|
|
|
|
|
|
|
+ int count = baseMapper.goldSendListSize(vo.getYearTime(),queryWrapper,dbName);
|
|
|
//每页10000条,计算总页数
|
|
//每页10000条,计算总页数
|
|
|
int maxPage = (int) Math.ceil(count/10000.0);
|
|
int maxPage = (int) Math.ceil(count/10000.0);
|
|
|
int start = 0;
|
|
int start = 0;
|
|
|
LinkedList<GoldSendExcelDTO> list = Lists.newLinkedList();
|
|
LinkedList<GoldSendExcelDTO> list = Lists.newLinkedList();
|
|
|
for (int i = 0; i < maxPage; i++) {
|
|
for (int i = 0; i < maxPage; i++) {
|
|
|
- LinkedList<GoldSendExcelDTO> findList = baseMapper.goldSendList(queryWrapper,dbName,start);
|
|
|
|
|
|
|
+ LinkedList<GoldSendExcelDTO> findList = baseMapper.goldSendList(vo.getYearTime(),queryWrapper,dbName,start);
|
|
|
start = findList.getLast().getId();
|
|
start = findList.getLast().getId();
|
|
|
list.addAll(findList);
|
|
list.addAll(findList);
|
|
|
}
|
|
}
|
|
@@ -381,13 +381,13 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
|
|
|
public List<GoldSendBankExcelDTO> excelGoldSendBankList(GoldSendPage page) {
|
|
public List<GoldSendBankExcelDTO> excelGoldSendBankList(GoldSendPage page) {
|
|
|
try {
|
|
try {
|
|
|
QueryWrapper queryWrapper = getQueryWrapper(page);
|
|
QueryWrapper queryWrapper = getQueryWrapper(page);
|
|
|
- int count = baseMapper.goldSendListSize(queryWrapper,dbName);
|
|
|
|
|
|
|
+ int count = baseMapper.goldSendListSize(page.getYearTime(),queryWrapper,dbName);
|
|
|
//每页10000条,计算总页数
|
|
//每页10000条,计算总页数
|
|
|
int maxPage = (int) Math.ceil(count/10000.0);
|
|
int maxPage = (int) Math.ceil(count/10000.0);
|
|
|
int start = 0;
|
|
int start = 0;
|
|
|
LinkedList<GoldSendBankExcelDTO> list = Lists.newLinkedList();
|
|
LinkedList<GoldSendBankExcelDTO> list = Lists.newLinkedList();
|
|
|
for (int i = 0; i < maxPage; i++) {
|
|
for (int i = 0; i < maxPage; i++) {
|
|
|
- LinkedList<GoldSendBankExcelDTO> findList = baseMapper.goldSendBankList(queryWrapper,dbName,start);
|
|
|
|
|
|
|
+ LinkedList<GoldSendBankExcelDTO> findList = baseMapper.goldSendBankList(page.getYearTime(),queryWrapper,dbName,start);
|
|
|
start = findList.getLast().getId();
|
|
start = findList.getLast().getId();
|
|
|
list.addAll(findList);
|
|
list.addAll(findList);
|
|
|
}
|
|
}
|