demand:1.定制导出排除废弃的发票 2.定制导出修改业务员取值
committer: heyu
This commit is contained in:
parent
c36991ea41
commit
5c2bad4ef5
@ -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());
|
||||
// 面单单号
|
||||
|
||||
Loading…
Reference in New Issue
Block a user