Bläddra i källkod

feat(apCheck): 对账功能更新: 应收对账查询客户和应付对账查询供应商列表时删除对账状态过滤条件

hejq 7 år sedan
förälder
incheckning
dfb73ad642

+ 2 - 3
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApBillServiceImpl.java

@@ -244,10 +244,9 @@ public class PurchaseApBillServiceImpl implements PurchaseApBillService {
         List<Vendor> vendors = findVendorByPage(params, keyword);
         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());
             System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "100");
-            resultVendors.parallelStream().forEach(vendor -> purchaseApCheckService.countApCheck(vendor, checkDate, fromDate, endDate));
-            purchaseApCheckService.setVendorSPage(params, resultVendors, vendorSPage);
+            vendors.parallelStream().forEach(vendor -> purchaseApCheckService.countApCheck(vendor, checkDate, fromDate, endDate));
+            purchaseApCheckService.setVendorSPage(params, vendors, vendorSPage);
         }
         return vendorSPage;
     }

+ 4 - 5
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -610,13 +610,12 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
      */
     @Override
     public SPage<Vendor> getCustomerInfo(PageParams params, String keyword, String checkDate, Long fromDate, Long endDate) throws InterruptedException {
-        List<Vendor> vendors = findCustomerByPage(params, keyword);
+        List<Vendor> customers = 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());
+        if (!CollectionUtils.isEmpty(customers)) {
             System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "100");
-            resultVendors.parallelStream().forEach(customer -> this.countApCheck(customer, checkDate, fromDate, endDate));
-            setVendorSPage(params, resultVendors, vendorSPage);
+            customers.parallelStream().forEach(customer -> this.countApCheck(customer, checkDate, fromDate, endDate));
+            setVendorSPage(params, customers, vendorSPage);
         }
         return vendorSPage;
     }