|
@@ -328,11 +328,10 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
|
|
|
public void exportPatentPdfFirstPages(PatentVO params) throws IOException {
|
|
|
log.info("开始处理【合并导出专题库专利的pdf首页文件】的业务,业务参数为:{}", params);
|
|
|
|
|
|
- //根据筛选条件分页查询专利清单(这一次查询目的只是获得专利总数和总页数)
|
|
|
- //IPage<PatentDTO> pageList0 = patentService.getPageList(params);
|
|
|
+ //根据筛选条件分页查询专利清单(本次查询目的只是获得专利总数和总页数)
|
|
|
IPage<Patent> pageList0 = patentMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
if (pageList0 == null || pageList0.getRecords() == null || pageList0.getRecords().size() == 0) {
|
|
|
- ThrowException.throwXiaoShiException("合并专利pdf首页文档失败,无专利信息!");
|
|
|
+ ThrowException.throwXiaoShiException("合并专利pdf首页文档失败,未查询到任何专利信息!");
|
|
|
}
|
|
|
|
|
|
int total = (int) pageList0.getTotal(); //专利总数(作为任务进度总数)
|
|
@@ -549,7 +548,6 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
|
|
|
IPage<PatentDTO> pageListResult = new Page<>();
|
|
|
ArrayList<PatentDTO> patentDTOs = new ArrayList<>();
|
|
|
//根据筛选条件分页查询专利清单(这一次查询目的只是获得专利总数和总页数)
|
|
|
- //IPage<PatentDTO> pageList = patentService.getPageList(params);
|
|
|
IPage<Patent> pageList = patentMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
if (pageList == null || pageList.getRecords() == null || pageList.getRecords().size() == 0) {
|
|
|
ThrowException.throwXiaoShiException("查询专题库专利的pdf首页图片清单失败,未获取到任何专利信息!");
|