diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java index 360ee589..67c93f76 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/FpcjServiceImpl.java @@ -66,6 +66,7 @@ public class FpcjServiceImpl extends MpBaseServiceImpl gfxxList = super.baseMapper.selectGfxxList(pramsMap); + log.info("gfxxList====>{}",gfxxList); PageHelper.startPage(curr, size); List pageList = super.baseMapper.selectByGfshAndCjrq(pramsMap); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 1a76e634..258fc5ea 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -357,12 +357,12 @@ public class PoolAddTaxThread extends BaseThread { if (hasNext) { int nextPage = pageData.getIntValue("nextPage"); // 写入当前页数据 - exportListArrayToExcel(excelFile, title, titleColumns, dataList, firstPage, false, 1, "发票信息", out, writer); + exportListArrayToExcel(excelFile, title, titleColumns, dataList, firstPage, false, 1, "增值税发票", out, writer); // 更新页数 return cicleExport(pramsMap, nextPage, excelFile, out, writer); } else { // 写入最后一页数据 - exportListArrayToExcel(excelFile, title, titleColumns, dataList, firstPage, true, 1, "发票信息", out, writer); + exportListArrayToExcel(excelFile, title, titleColumns, dataList, firstPage, true, 1, "增值税发票", out, writer); return hasNext; } @@ -417,7 +417,7 @@ public class PoolAddTaxThread extends BaseThread { if (firstPage) { writeSheet = new WriteSheet(); writeSheet.setSheetNo(sheetNo); - writeSheet.setSheetName(title); + writeSheet.setSheetName(sheetName); writeTable = new WriteTable(); writeTable.setTableNo(sheetNo); List> titles = new ArrayList<>(); diff --git a/dxhy-core/src/main/resources/mapper/FpcjhzMapper.xml b/dxhy-core/src/main/resources/mapper/FpcjhzMapper.xml index 66d7ff33..5b7f328f 100644 --- a/dxhy-core/src/main/resources/mapper/FpcjhzMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpcjhzMapper.xml @@ -116,7 +116,8 @@ #{item} and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08')) - and t.source_system = '0' and t.detail_yesorno = '1' + and t.source_system = '0' +-- and t.detail_yesorno = '1'