demand: 保留原sql重起一个sql

committer: heyu

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<EmisSettleInvoiceChRecord> list = emisSettleInvoiceChRecordService.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord);
+        return getDataTable(list);
+    }
+
 
      /**
      * 检查是否重复

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<EmisSettleInvoiceChRecord> selectEmisSettleInvoiceChRecordListAll(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord);
 }

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<EmisSettleInvoiceChRecord> selectEmisSettleInvoiceChRecordList(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord)
     {
-        long startTime = System.currentTimeMillis();
+        List<EmisSettleInvoiceChRecord> emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordList(emisSettleInvoiceChRecord);
-        List<EmisSettleInvoiceChRecord> emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord);
-        long endTime = System.currentTimeMillis();
-        log.info("查询渠道开票记录列表完成, 耗时: {}ms", (endTime - startTime));
         return emisSettleInvoiceChRecords;
     }
 
@@ -141,7 +139,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
                 final int currentPage = pageNum;
                 Future<List<EmisSettleInvoiceChRecordExportVO>> future = executor.submit(() -> {
                     PageHelper.startPage(currentPage, pageSize);
-                    List<EmisSettleInvoiceChRecord> list = this.selectEmisSettleInvoiceChRecordList(
+                    List<EmisSettleInvoiceChRecord> list = this.selectEmisSettleInvoiceChRecordListAll(
                             emisSettleInvoiceChRecord);
 
                     if (list == null || list.isEmpty()) {
@@ -217,6 +215,15 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem
         }
     }
 
+    @Override
+    public List<EmisSettleInvoiceChRecord> selectEmisSettleInvoiceChRecordListAll(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord) {
+        long startTime = System.currentTimeMillis();
+        List<EmisSettleInvoiceChRecord> emisSettleInvoiceChRecords = emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordListAll(emisSettleInvoiceChRecord);
+        long endTime = System.currentTimeMillis();
+        log.info("查询渠道开票记录列表完成, 耗时: {}ms", (endTime - startTime));
+        return emisSettleInvoiceChRecords;
+    }
+
 
     @Override
     public int checkHasSendToHx(String applySeqNo)