src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -138,4 +138,15 @@ List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationService.getPaymentRecordList(supplierId); return success(paymentRecordList); } /** * 查询付款登记列表 * * @param paymentRegistrationDto 付款登记 * @return 付款登记集合 */ @GetMapping("/paymentHistoryListPage") public IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, PaymentRegistrationDto paymentRegistrationDto) { return paymentRegistrationService.paymentHistoryListPage(page,paymentRegistrationDto); } } src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -1,5 +1,7 @@ package com.ruoyi.purchase.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; @@ -117,4 +119,12 @@ public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) { return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto)); } /** * 查询采购台账列表 */ @GetMapping("/listPage") public IPage<PurchaseLedger> listPage(Page page, PurchaseLedger purchaseLedger) { return purchaseLedgerService.selectPurchaseLedgerListPage(page ,purchaseLedger); } } src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -1,5 +1,7 @@ package com.ruoyi.purchase.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; @@ -109,4 +111,12 @@ public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) { return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto)); } /** * 查询来票登记列表 */ @GetMapping("/listPage") public IPage<TicketRegistration> listPage(Page page, TicketRegistration ticketRegistration) { return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration); } } src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java
@@ -1,6 +1,8 @@ package com.ruoyi.purchase.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.purchase.dto.PaymentHistoryRecordVo; import com.ruoyi.purchase.dto.PaymentRegistrationDto; import com.ruoyi.purchase.pojo.PaymentRegistration; @@ -52,4 +54,12 @@ * @return */ List<PaymentHistoryRecordVo> getPaymentRecordList(Long supplierId); /** * 查询付款登记列表 * * @param paymentRegistrationDto 付款登记 * @return 付款登记集合 */ IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, @Param("params") PaymentRegistrationDto paymentRegistrationDto); } src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java
@@ -87,4 +87,12 @@ * @return */ List<PaymentHistoryRecordVo> getPaymentRecordList(Long supplierId); /** * 查询付款登记列表分页 * * @param paymentRegistrationDto 付款登记 * @return 付款登记集合 */ IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, PaymentRegistrationDto paymentRegistrationDto); } src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -1,6 +1,7 @@ package com.ruoyi.purchase.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.purchase.dto.PurchaseLedgerDto; import com.ruoyi.purchase.pojo.PurchaseLedger; @@ -31,4 +32,6 @@ List getPurchasesNo(); PurchaseLedgerDto getPurchaseNoById(Long id); IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger); } src/main/java/com/ruoyi/purchase/service/ITicketRegistrationService.java
@@ -1,5 +1,7 @@ package com.ruoyi.purchase.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.purchase.dto.TicketRegistrationDto; import com.ruoyi.purchase.pojo.TicketRegistration; @@ -24,4 +26,6 @@ TicketRegistrationDto getRegistrationById(TicketRegistrationDto ticketRegistrationDto); List getTicketNo(TicketRegistrationDto ticketRegistrationDto); IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration); } src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -405,6 +405,17 @@ return result; } /** * 查询付款登记列表分页 * * @param paymentRegistrationDto 付款登记 * @return 付款登记集合 */ @Override public IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, PaymentRegistrationDto paymentRegistrationDto) { return paymentRegistrationMapper.paymentHistoryListPage(page, paymentRegistrationDto); } // 批量查询采购台账（当月） private Map<Long, List<PurchaseLedger>> batchQueryPurchaseLedgers(List<Long> supplierIds, LocalDate startDate, LocalDate endDate) { LambdaQueryWrapper<PurchaseLedger> query = new LambdaQueryWrapper<>(); src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -1,6 +1,7 @@ package com.ruoyi.purchase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -417,6 +418,15 @@ return purchaseLedgerDto; } @Override public IPage<PurchaseLedger> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedger purchaseLedger) { LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) { queryWrapper.like(PurchaseLedger::getPurchaseContractNumber, purchaseLedger.getPurchaseContractNumber()); } return purchaseLedgerMapper.selectPage(ipage, queryWrapper); } /** * 下划线命名转驼峰命名 */ src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -1,7 +1,9 @@ package com.ruoyi.purchase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.DateUtils; @@ -266,6 +268,37 @@ ).collect(Collectors.toList()); } @Override public IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration) { LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(ticketRegistration.getPurchaseContractNumber())) { queryWrapper.like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getPurchaseContractNumber()) .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierName()) .eq(TicketRegistration::getIssueDate, ticketRegistration.getIssueDate()); } IPage<TicketRegistration> ticketRegistrationIPage = ticketRegistrationMapper.selectPage(page, queryWrapper); // 计算已付款金额 if(CollectionUtils.isNotEmpty(ticketRegistrationIPage.getRecords())){ List<Long> ids = ticketRegistrationIPage.getRecords().stream().map(TicketRegistration::getId).collect(Collectors.toList()); List<PaymentRegistrationDto> paymentRegistrationDtoList = paymentRegistrationMapper.countPaymentTotalByTicketRegId(ids); for (TicketRegistration registration : ticketRegistrationIPage.getRecords()) { BigDecimal paymentAmountTotal = BigDecimal.ZERO; for (PaymentRegistrationDto paymentRegistrationDto : paymentRegistrationDtoList) { if(registration.getId().equals(paymentRegistrationDto.getTicketRegistrationId())){ paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal(); break; } } BigDecimal invoiceAmount = registration.getInvoiceAmount(); BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal); registration.setPaymentAmountTotal(paymentAmountTotal); registration.setUnPaymentAmountTotal(subtractAmount); } } return ticketRegistrationIPage; } private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type) { if (products == null || products.isEmpty()) { return; src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -149,4 +149,26 @@ </select> <select id="paymentHistoryListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto"> SELECT T1.payment_date, T2.supplier_name, T1.current_payment_amount, T1.payment_method, T3.nick_name AS registrant, T1.registrationt_date FROM payment_registration T1 LEFT JOIN supplier_manage T2 ON T1.supplier_id = T2.id LEFT JOIN sys_user T3 ON T3.user_id = T1.registrant_id <where> <if test="params.searchText != null and params.searchText != '' "> AND T2.supplier_name LIKE CONCAT('%',#{params.searchText},'%') </if> </where> ORDER BY T1.payment_date,T1.create_time DESC </select> </mapper>
