diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java index 0d1073385..be8c8992e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java @@ -76,6 +76,21 @@ public class EmisSettleInvoiceChRecordController extends BaseController return getDataTable(list); } + /** + * 查询渠道开票记录表列表 + */ +// @PreAuthorize("@ss.hasPermi('emis:emisSettleInvoiceChRecord:list')") + @GetMapping("/listAll") + public TableDataInfo listAll(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) + { + startPage(); + + setPrivParams(emisSettleInvoiceChRecord); + + List list = emisSettleInvoiceChRecordService.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord); + return getDataTable(list); + } + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceChRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceChRecordService.java index 69e7ea8cc..5b028e9ea 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceChRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleInvoiceChRecordService.java @@ -103,4 +103,5 @@ public interface IEmisSettleInvoiceChRecordService */ void export(HttpServletResponse response, EmisSettleInvoiceChRecord emisSettleInvoiceChRecord); + List selectEmisSettleInvoiceChRecordListAll(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index 45247fc17..b3012f46a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.concurrent.*; @@ -110,10 +111,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem @Override public List selectEmisSettleInvoiceChRecordList(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) { - long startTime = System.currentTimeMillis(); - List emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord); - long endTime = System.currentTimeMillis(); - log.info("查询渠道开票记录列表完成, 耗时: {}ms", (endTime - startTime)); + List emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordList(emisSettleInvoiceChRecord); return emisSettleInvoiceChRecords; } @@ -141,7 +139,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem final int currentPage = pageNum; Future> future = executor.submit(() -> { PageHelper.startPage(currentPage, pageSize); - List list = this.selectEmisSettleInvoiceChRecordList( + List list = this.selectEmisSettleInvoiceChRecordListAll( emisSettleInvoiceChRecord); if (list == null || list.isEmpty()) { @@ -217,6 +215,15 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem } } + @Override + public List selectEmisSettleInvoiceChRecordListAll(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) { + long startTime = System.currentTimeMillis(); + List emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord); + long endTime = System.currentTimeMillis(); + log.info("查询渠道开票记录列表完成, 耗时: {}ms", (endTime - startTime)); + return emisSettleInvoiceChRecords; + } + @Override public int checkHasSendToHx(String applySeqNo)