yys 修改bug

maven

3 天以前 9c49c10d3d007d2c242383f3d0134a5aa402fec8

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -211,9 +211,11 @@
        // 计算回款金额，待回款金额
        List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
                .in(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerIds));

        List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
                .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
        List<InvoiceLedger> invoiceLedgers = new ArrayList<>();
        if(!CollectionUtils.isEmpty(invoiceRegistrationProducts)){
            invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
                    .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
        }
        List<ReceiptPayment> receiptPayments = new ArrayList<>();
        if(!CollectionUtils.isEmpty(invoiceLedgers)){
            receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
@@ -294,7 +296,18 @@
            }
            salesLedger.setInvoiceTotal(invoiceTotal);
            // 判断是否是生产完成
            salesLedger.setProductionStatus(salesLedgerProductCountMap.get(salesLedger.getId()) == null ? "未开始" : salesLedgerProductCountMap.get(salesLedger.getId()).compareTo(salesLedgerWorkCountMap.get(salesLedger.getId())) > 0 ? "生产中" : "已完成");
            String productionStatus = "";
            BigDecimal productCount = salesLedgerProductCountMap.get(salesLedger.getId());
            BigDecimal workCount = salesLedgerWorkCountMap.get(salesLedger.getId());

            if (productCount == null || workCount == null) {
                productionStatus = "未开始";
            } else if (productCount.compareTo(workCount) > 0) {
                productionStatus = "生产中";
            } else if(productCount.compareTo(workCount) <= 0){
                productionStatus = "已完成";
            }
            salesLedger.setProductionStatus(productionStatus);
        }
        if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
            if (salesLedgerDto.getStatus()) {