Browse Source

发票管理:排除关联金额为0的合同

24282 2 years ago
parent
commit
59f2872a70

+ 10 - 3
hx-purchase/src/main/java/com/fjhx/purchase/service/invoice/impl/InvoiceServiceImpl.java

@@ -116,11 +116,18 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         this.save(invoice);
         List<InvoiceDetails> invoiceDetailsList = invoice.getInvoiceDetailsList();
         if(CollectionUtils.isNotEmpty(invoiceDetailsList)){
-            for(InvoiceDetails d:invoiceDetailsList){
-                d.setInvoiceId(invoice.getId());
+
+            invoiceDetailsList = invoiceDetailsList.stream()
+                    .peek(item -> item.setInvoiceId(invoice.getId()))
+                    .filter(item -> item.getMoney() != null && item.getMoney().compareTo(BigDecimal.ZERO) > 0)
+                    .collect(Collectors.toList());
+
+            if (CollectionUtils.isNotEmpty(invoiceDetailsList)) {
+                invoiceDetailsService.saveBatch(invoiceDetailsList);
             }
-            invoiceDetailsService.saveBatch(invoiceDetailsList);
+
         }
+
         ObsFileUtil.saveFile(invoice.getFileList(),invoice.getId());
     }