From 5c2bad4ef54f1cd70de6481bbcea589d313c4ae8 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 26 May 2025 18:57:40 +0800 Subject: [PATCH] =?UTF-8?q?demand:1.=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=BA=9F=E5=BC=83=E7=9A=84=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=20=20=202.=E5=AE=9A=E5=88=B6=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=91=98=E5=8F=96=E5=80=BC=20commit?= =?UTF-8?q?ter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmisSettleInvoiceChRecordServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 b3012f46a..a0362e5ed 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 @@ -17,6 +17,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -140,7 +141,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem Future> future = executor.submit(() -> { PageHelper.startPage(currentPage, pageSize); List list = this.selectEmisSettleInvoiceChRecordListAll( - emisSettleInvoiceChRecord); + emisSettleInvoiceChRecord).stream().filter(i->!"3".equals(i.getOpenChStatus())).collect(Collectors.toList()); if (list == null || list.isEmpty()) { return new ArrayList<>(); @@ -170,7 +171,7 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem // 付款日期 vo.setPayDate(InvoiceExportHelper.processPayDate(record.getExportPayDays())); // 业务员 - vo.setSalesmen(record.getSalesmen()); + vo.setSalesmen(record.getApplyManName()); // 快递公司 vo.setExpressCompany(record.getSalesmen()); // 面单单号