产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
zss
8 天以前 00083c26fde57c0165427ae4cc712d24596fdbc6 
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java


@@ -3,8 +3,8 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;


import com.ruoyi.account.mapper.AccountIncomeMapper;


import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;


import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;


import com.ruoyi.approve.mapper.ApproveProcessMapper;


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.basic.mapper.CustomerMapper;


@@ -29,18 +29,14 @@


import com.ruoyi.production.mapper.*;


import com.ruoyi.project.system.domain.SysDept;


import com.ruoyi.project.system.mapper.SysDeptMapper;


import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;


import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;


import com.ruoyi.purchase.pojo.PaymentRegistration;


import com.ruoyi.purchase.pojo.PurchaseLedger;


import com.ruoyi.quality.mapper.QualityInspectMapper;


import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;


import com.ruoyi.quality.pojo.QualityInspect;


import com.ruoyi.quality.pojo.QualityUnqualified;


import com.ruoyi.sales.mapper.ReceiptPaymentMapper;


import com.ruoyi.sales.mapper.SalesLedgerMapper;


import com.ruoyi.sales.mapper.SalesLedgerProductMapper;


import com.ruoyi.sales.pojo.ReceiptPayment;


import com.ruoyi.sales.pojo.SalesLedger;


import com.ruoyi.sales.pojo.SalesLedgerProduct;


import com.ruoyi.staff.mapper.StaffOnJobMapper;


@@ -82,10 +78,6 @@




    private final ApproveProcessMapper approveProcessMapper;




    private final ReceiptPaymentMapper receiptPaymentMapper;




    private final PaymentRegistrationMapper paymentRegistrationMapper;




    private final SysDeptMapper sysDeptMapper;




    private final NoticeMapper noticeMapper;


@@ -111,7 +103,7 @@


    private final ProductionOperationTaskMapper productionOperationTaskMapper;




    private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;


    private final AccountIncomeMapper accountIncomeMapper;


    private final AccountSalesCollectionMapper accountSalesCollectionMapper;




    private final ProductionAccountMapper productionAccountMapper;




@@ -412,6 +404,7 @@


     */


    @Override


    public StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type) {


        StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();


        LocalDate today = LocalDate.now();


        LocalDate startDate = null;


        LocalDate endDate = null;


@@ -438,48 +431,14 @@


                break;


        }


        // 应收


        List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                // .ge(SalesLedger::getEntryDate, startDate)


                // .lt(SalesLedger::getEntryDate, endDate)


        );


        // BigDecimal receivableMoney =


        // salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal receivableMoney = sumAmount(salesLedgers, SalesLedger::getContractAmount);




        // 应付


        List<PurchaseLedger> procurementRecords = purchaseLedgerMapper


                .selectList(new LambdaQueryWrapper<PurchaseLedger>()


                        // .ge(PurchaseLedger::getEntryDate, startDate)


                        // .lt(PurchaseLedger::getEntryDate, endDate)


                );


        // BigDecimal payableMoney =


        // procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal payableMoney = sumAmount(procurementRecords, PurchaseLedger::getContractAmount);




        // 预收


        List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()


                // .ge(ReceiptPayment::getReceiptPaymentDate, startDate)


                // .lt(ReceiptPayment::getReceiptPaymentDate, endDate)


        );


        // BigDecimal advanceMoney =


        // receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal advanceMoney = sumAmount(receiptPayments, ReceiptPayment::getReceiptPaymentAmount);




        // 预付


        List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper


                .selectList(new LambdaQueryWrapper<PaymentRegistration>()


                        // .ge(PaymentRegistration::getPaymentDate, startDate)


                        // .lt(PaymentRegistration::getPaymentDate, endDate)


                );


        // BigDecimal prepayMoney =


        // paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal prepayMoney = sumAmount(paymentRegistrations, PaymentRegistration::getCurrentPaymentAmount);


        StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();


        statisticsReceivablePayableDto.setPayableMoney(payableMoney.subtract(prepayMoney));


        statisticsReceivablePayableDto.setReceivableMoney(receivableMoney.subtract(advanceMoney));


        statisticsReceivablePayableDto.setAdvanceMoney(advanceMoney);


        statisticsReceivablePayableDto.setPrepayMoney(prepayMoney);








        return statisticsReceivablePayableDto;


    }


@@ -1162,7 +1121,7 @@


        String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));




        // 2. 查询数据


        List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> incomeList = accountSalesCollectionMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);






@@ -1219,7 +1178,7 @@


        String startStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


        String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));




        List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> incomeList = accountSalesCollectionMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);




        Map<String, BigDecimal> incomeMap = incomeList.stream().collect(Collectors