aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值' (#39) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/39
This commit is contained in:
smshen 2025-05-27 09:07:56 +08:00
commit 46407a5996
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java
View File

@ -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<List<EmisSettleInvoiceChRecordExportVO>> future = executor.submit(() -> {
PageHelper.startPage(currentPage, pageSize);
List<EmisSettleInvoiceChRecord> 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());
// 面单单号