|
|
|
@ -4,12 +4,7 @@ import java.math.BigDecimal; |
|
|
|
|
import java.text.ParseException; |
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Calendar; |
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
@ -542,7 +537,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx |
|
|
|
|
currentTax = currentTax.subtract(pageList.get(i).getTaxAmount()); |
|
|
|
|
hjje = hjje.subtract(pageList.get(i).getInvoiceAmount()); |
|
|
|
|
|
|
|
|
|
List<BaseTDxRecordInvoice> collect = pageList.stream().skip(i + 1).sorted((e1, e2) -> e1.getTaxAmount().compareTo(e2.getTaxAmount())).collect(Collectors.toList()); |
|
|
|
|
List<BaseTDxRecordInvoice> collect = pageList.stream().skip(i + 1).sorted(Comparator.comparing(BaseTDxRecordInvoice::getTaxAmount)).collect(Collectors.toList()); |
|
|
|
|
if (collect != null && collect.size() > 0){ |
|
|
|
|
log.info("从小到大排序在进行添加"); |
|
|
|
|
for (int j = 0; j < collect.size(); j++) { |
|
|
|
|