feat: 应收应付对账返回方法调整优化；采用JDK8 并行方法

src/main/java/com/uas/platform/b2b/service/PurchaseApCheckService.java

@@ -178,7 +178,7 @@ public interface PurchaseApCheckService {
      * @return 统计结果
      * @throws InterruptedException 中断异常
      */
-    List<ApCheckAmount> getThisMonthTodoTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) throws InterruptedException;
+    List<ApCheckAmount> getThisMonthTodoTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate);
 
     /**
      * 获取指定月份应收金额（已收）
@@ -191,7 +191,7 @@ public interface PurchaseApCheckService {
      * @return 统计结果
      * @throws InterruptedException 中断异常
      */
-    List<ApCheckAmount> getThisMonthDoneTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) throws InterruptedException;
+    List<ApCheckAmount> getThisMonthDoneTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate);
 
     /**
      * 根据统计信息按币别分类处理
@@ -217,5 +217,5 @@ public interface PurchaseApCheckService {
      * @param fromDate 起始时间
      * @param endDate 截止时间
      */
-    void countApCheck(Vendor customer, String checkDate, Long fromDate, Long endDate) throws InterruptedException;
+    void countApCheck(Vendor customer, String checkDate, Long fromDate, Long endDate);
 }

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -184,20 +184,10 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
         erpProdIo.setThisMonthCount(thisMonthTrades);
         if (!CollectionUtil.isEmpty(thisMonthTrades)) {
             // 本月应收（未收）
-            List<ApCheckAmount> thisMonthTodoTrades = null;
-            try {
-                thisMonthTodoTrades = apCheckService.getThisMonthTodoTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+            List<ApCheckAmount> thisMonthTodoTrades = apCheckService.getThisMonthTodoTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
             erpProdIo.setThisMonthTodoCount(thisMonthTodoTrades);
             // 本月应收（已收）
-            List<ApCheckAmount> thisMonthDoneTrades = null;
-            try {
-                thisMonthDoneTrades = apCheckService.getThisMonthDoneTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+            List<ApCheckAmount>  thisMonthDoneTrades = apCheckService.getThisMonthDoneTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
             erpProdIo.setThisMonthDoneCount(thisMonthDoneTrades);
         }
     }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApBillServiceImpl.java

@@ -246,29 +246,8 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         SPage<Vendor> vendorSPage = new SPage<>();
         if (!org.springframework.util.CollectionUtils.isEmpty(vendors)) {
             List<Vendor> resultVendors = vendors.stream().filter(customer -> null != customer.getApcheck() && customer.getApcheck() == 1).collect(Collectors.toList());
-            // 最大线程数
-            int maxRunSize = 10;
-            // 每组分发的List数量
-            int groupSize = (int) Math.ceil((double) resultVendors.size() / maxRunSize);
-            List<List<Vendor>> vendorsGroupList = SplitArray.splitAry(resultVendors, groupSize);
-            CountDownLatch threadsSignal = new CountDownLatch(vendorsGroupList.size());
-            vendorsGroupList.forEach(vendorList ->
-                vendorList.forEach(customer -> {
-                    try {
-                        executor.submitTask(() -> {
-                            try {
-                                purchaseApCheckService.countApCheck(customer, checkDate, fromDate, endDate);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            threadsSignal.countDown();
-                        });
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                })
-            );
-            threadsSignal.await();
+            System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "100");
+            resultVendors.parallelStream().forEach(vendor -> purchaseApCheckService.countApCheck(vendor, checkDate, fromDate, endDate));
             purchaseApCheckService.setVendorSPage(params, resultVendors, vendorSPage);
         }
         return vendorSPage;

src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -4,8 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.constant.StringConstant;
 import com.uas.platform.b2b.core.util.BoundedExecutor;
 import com.uas.platform.b2b.core.util.ContextUtils;
-import com.uas.platform.b2b.core.util.SplitArray;
-import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.PurchaseApCheckDao;
@@ -25,9 +23,9 @@ import com.uas.platform.b2b.model.PurchaseApCheckTodo;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.model.SourceForApcheck;
 import com.uas.platform.b2b.model.Vendor;
-import com.uas.platform.b2b.model.util.ApCheckeAllCountSqls;
-import com.uas.platform.b2b.model.util.ApCheckeDoneCountSqls;
-import com.uas.platform.b2b.model.util.ApCheckeTodoCountSqls;
+import com.uas.platform.b2b.model.util.ApCheckAllCountSqls;
+import com.uas.platform.b2b.model.util.ApCheckDoneCountSqls;
+import com.uas.platform.b2b.model.util.ApCheckTodoCountSqls;
 import com.uas.platform.b2b.publicapi.model.ApCheckAmount;
 import com.uas.platform.b2b.service.ErpProdIODetailService;
 import com.uas.platform.b2b.service.OrderRedDotService;
@@ -65,8 +63,6 @@ import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 /**
@@ -556,35 +552,16 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
      */
     @Override
     public SPage<Vendor> getCustomerInfo(PageParams params, String keyword, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
+        Long start = System.currentTimeMillis();
         List<Vendor> vendors = findCustomerByPage(params, keyword);
         SPage<Vendor> vendorSPage = new SPage<>();
         if (!CollectionUtils.isEmpty(vendors)) {
             List<Vendor> resultVendors = vendors.stream().filter(customer -> null != customer.getApcheck() && customer.getApcheck() == 1).collect(Collectors.toList());
-            // 最大线程数
-            int maxRunSize = 10;
-            // 每组分发的List数量
-            int groupSize = (int) Math.ceil((double) resultVendors.size() / maxRunSize);
-            List<List<Vendor>> vendorsGroupList = SplitArray.splitAry(resultVendors, groupSize);
-            CountDownLatch threadsSignal = new CountDownLatch(vendorsGroupList.size());
-            vendorsGroupList.forEach(vendorList ->
-                vendorList.forEach(customer -> {
-                    try {
-                        executor.submitTask(() -> {
-                            try {
-                                this.countApCheck(customer, checkDate, fromDate, endDate);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                            threadsSignal.countDown();
-                        });
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                })
-            );
-            threadsSignal.await();
+            System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "100");
+            resultVendors.parallelStream().forEach(customer -> this.countApCheck(customer, checkDate, fromDate, endDate));
             setVendorSPage(params, resultVendors, vendorSPage);
         }
+        System.out.println("并行方法： " + (System.currentTimeMillis() - start));
         return vendorSPage;
     }
 
@@ -597,7 +574,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
      * @param endDate 截止时间
      */
     @Override
-    public void countApCheck(Vendor customer, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
+    public void countApCheck(Vendor customer, String checkDate, Long fromDate, Long endDate) {
         final Long customerUU = customer.getMyEnUU();
         final Long vendorUU = customer.getVendEnUU();
         if (!StringUtils.isEmpty(customer.getTotalCountString())) {
@@ -613,28 +590,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
             customer.setThisMonthCount(thisMonthTrades);
             // 总额存在再进行其他查询
             if (!CollectionUtils.isEmpty(thisMonthTrades)) {
-                CountDownLatch threadsSignal = new CountDownLatch(2);
                 // 本月应收（未收）
-                executor.submitTask(() -> {
-                    try {
-                        List<ApCheckAmount> thisMonthTodoTrades = getThisMonthTodoTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
-                        customer.setThisMonthTodoCount(thisMonthTodoTrades);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    threadsSignal.countDown();
-                });
+                List<ApCheckAmount> thisMonthTodoTrades = getThisMonthTodoTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
+                customer.setThisMonthTodoCount(thisMonthTodoTrades);
                 // 本月应收（已收）
-                executor.submitTask(() -> {
-                    try {
-                        List<ApCheckAmount> thisMonthDoneTrades = getThisMonthDoneTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
-                        customer.setThisMonthDoneCount(thisMonthDoneTrades);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                    threadsSignal.countDown();
-                });
-                threadsSignal.await();
+                List<ApCheckAmount> thisMonthDoneTrades = getThisMonthDoneTrade(vendorUU, customerUU, checkDate, fromDate, endDate);
+                customer.setThisMonthDoneCount(thisMonthDoneTrades);
             }
         }
     }
@@ -720,41 +681,24 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
      * @return 统计结果
      */
     @Override
-    public List<ApCheckAmount> getThisMonthTodoTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
+    public List<ApCheckAmount> getThisMonthTodoTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) {
         DateFilter filter = erpProdIODetailService.initFilter(fromDate, endDate, checkDate);
         List<ApCheckAmount> totalTrades = new ArrayList<>();
-        CountDownLatch threadsSignal = new CountDownLatch(5);
         // 货款调账
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeTodoCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
+        List<ApCheckAmount> trades = commonDao.query(ApCheckTodoCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(trades);
         // 采购验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeTodoCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
+        List<ApCheckAmount> saleAcceptTrades = commonDao.query(ApCheckTodoCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleAcceptTrades);
         // 采购验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeTodoCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
+        List<ApCheckAmount> saleReturnTrades = commonDao.query(ApCheckTodoCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleReturnTrades);
         // 委外验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeTodoCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
+        List<ApCheckAmount> makeAcceptTrades = commonDao.query(ApCheckTodoCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeAcceptTrades);
         // 委外验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeTodoCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-        threadsSignal.await();
+        List<ApCheckAmount> makeReturnTrades = commonDao.query(ApCheckTodoCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeReturnTrades);
         return groupCountByCurrency(totalTrades);
     }
 
@@ -797,41 +741,24 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
      * @return 统计结果
      */
     @Override
-    public List<ApCheckAmount> getThisMonthDoneTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
+    public List<ApCheckAmount> getThisMonthDoneTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) {
         DateFilter filter = erpProdIODetailService.initFilter(fromDate, endDate, checkDate);
         List<ApCheckAmount> totalTrades = new ArrayList<>();
         // 货款调账
-        CountDownLatch finalThreadsSignal = new CountDownLatch(5);
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeDoneCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                finalThreadsSignal.countDown();
-            });
+        List<ApCheckAmount> trades = commonDao.query(ApCheckDoneCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(trades);
         // 采购验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeDoneCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                finalThreadsSignal.countDown();
-            });
+        List<ApCheckAmount> saleAcceptTrades = commonDao.query(ApCheckDoneCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleAcceptTrades);
         // 采购验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeDoneCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                finalThreadsSignal.countDown();
-            });
+        List<ApCheckAmount> saleReturnTrades = commonDao.query(ApCheckDoneCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleReturnTrades);
         // 委外验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeDoneCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                finalThreadsSignal.countDown();
-            });
+        List<ApCheckAmount> makeAcceptTrades = commonDao.query(ApCheckDoneCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeAcceptTrades);
         // 委外验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeDoneCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                finalThreadsSignal.countDown();
-            });
-        finalThreadsSignal.await();
+        List<ApCheckAmount> makeReturnTrades = commonDao.query(ApCheckDoneCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeReturnTrades);
         return groupCountByCurrency(totalTrades);
     }
 
@@ -849,38 +776,21 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
     public List<ApCheckAmount> getThisMonthTrade(Long enUU, Long customerUU, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
         DateFilter filter = erpProdIODetailService.initFilter(fromDate, endDate, checkDate);
         List<ApCheckAmount> totalTrades = new ArrayList<>();
-        final CountDownLatch threadsSignal = new CountDownLatch(5);
-            // 货款调账
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-            // 采购验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-            // 采购验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-            // 委外验收
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-            // 委外验退
-        executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
-                totalTrades.addAll(trades);
-                threadsSignal.countDown();
-            });
-        threadsSignal.await();
+        // 货款调账
+        List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.THISMONTH_ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(trades);
+        // 采购验收
+        List<ApCheckAmount> saleAcceptTrades = commonDao.query(ApCheckAllCountSqls.THISMONTH_SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleAcceptTrades);
+        // 采购验退
+        List<ApCheckAmount> saleReturnTrades = commonDao.query(ApCheckAllCountSqls.THISMONTH_SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(saleReturnTrades);
+        // 委外验收
+        List<ApCheckAmount> makeAcceptTrades = commonDao.query(ApCheckAllCountSqls.THISMONTH_MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeAcceptTrades);
+        // 委外验退
+        List<ApCheckAmount> makeReturnTrades = commonDao.query(ApCheckAllCountSqls.THISMONTH_MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU, filter.getFromDate(), filter.getEndDate());
+        totalTrades.addAll(makeReturnTrades);
         return groupCountByCurrency(totalTrades);
     }
 
@@ -897,31 +807,31 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
         final CountDownLatch threadsSignal = new CountDownLatch(5);
         // 货款调账
         executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
+                List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.ADJUSTMENT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
                 totalTrades.addAll(trades);
                 threadsSignal.countDown();
             });
         // 采购验收
         executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
+                List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.SALE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
                 totalTrades.addAll(trades);
                 threadsSignal.countDown();
             });
         // 采购验退
         executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
+                List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.SALE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
                 totalTrades.addAll(trades);
                 threadsSignal.countDown();
             });
         // 委外验收
         executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
+                List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.MAKE_ACCEPT_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
                 totalTrades.addAll(trades);
                 threadsSignal.countDown();
             });
         // 委外验退
         executor.submitTask(() -> {
-                List<ApCheckAmount> trades = commonDao.query(ApCheckeAllCountSqls.MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
+                List<ApCheckAmount> trades = commonDao.query(ApCheckAllCountSqls.MAKE_RETURN_COUNT_SQL, ApCheckAmount.class, enUU, customerUU);
                 totalTrades.addAll(trades);
                 threadsSignal.countDown();
             });