From 0050395dfb05425f0a929bc1587b971d78f1e95e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 26 五月 2025 17:47:28 +0800
Subject: [PATCH] 首页数据排序
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 130 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 118 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index c20172e..4af2a04 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.sales.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,15 +11,10 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.sales.dto.MonthlyAmountDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
-import com.ruoyi.sales.mapper.CommonFileMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
-import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.CommonFile;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.ISalesLedgerService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -32,7 +26,6 @@
import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -71,6 +64,10 @@
private final TempFileMapper tempFileMapper;
+ private final ReceiptPaymentMapper receiptPaymentMapper;
+
+ private final InvoiceLedgerMapper invoiceLedgerMapper;
+
@Autowired
private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
@@ -103,6 +100,9 @@
LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
+ for (SalesLedgerProduct product : products) {
+ product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
+ }
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -159,8 +159,114 @@
@Override
public List getTopFiveList() {
-
- return null;
+ // 鏌ヨ鍘熷鏁版嵁
+ LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.select(SalesLedger::getCustomerId,
+ SalesLedger::getCustomerName,
+ SalesLedger::getContractAmount)
+ .orderByDesc(SalesLedger::getContractAmount);
+ List<SalesLedger> records = salesLedgerMapper.selectList(queryWrapper);
+
+ // 鎸夊鎴稩D鍒嗙粍骞惰仛鍚堥噾棰�
+ Map<Long, GroupedCustomer> groupedMap = new LinkedHashMap<>(); // 浣跨敤LinkedHashMap淇濇寔鎺掑簭
+ for (SalesLedger record : records) {
+ groupedMap.computeIfAbsent(record.getCustomerId(),
+ k -> new GroupedCustomer(record.getCustomerId(), record.getCustomerName()))
+ .addAmount(record.getContractAmount());
+ }
+
+ // 杞崲涓虹粨鏋滃垪琛ㄥ苟鍙栧墠5
+ return groupedMap.values().stream()
+ .sorted(Comparator.comparing(GroupedCustomer::getTotalAmount).reversed())
+ .limit(5)
+ .map(customer -> {
+ Map<String, Object> result = new HashMap<>();
+ result.put("customerId", customer.getCustomerId());
+ result.put("customerName", customer.getCustomerName());
+ result.put("totalAmount", customer.getTotalAmount());
+ return result;
+ })
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public List<MonthlyAmountDto> getAmountHalfYear() {
+ LocalDate now = LocalDate.now();
+ YearMonth currentMonth = YearMonth.from(now);
+
+ List<MonthlyAmountDto> monthlyAmounts = new ArrayList<>();
+
+ for (int i = 0; i < 6; i++) {
+ YearMonth targetMonth = currentMonth.minusMonths(i);
+ LocalDate firstDayOfMonth = targetMonth.atDay(1);
+ LocalDate firstDayOfNextMonth = targetMonth.plusMonths(1).atDay(1);
+
+ LocalDateTime startOfMonth = firstDayOfMonth.atStartOfDay();
+ LocalDateTime startOfNextMonth = firstDayOfNextMonth.atStartOfDay();
+
+ LambdaQueryWrapper<ReceiptPayment> receiptPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ receiptPaymentLambdaQueryWrapper.ge(ReceiptPayment::getCreateTime, startOfMonth)
+ .lt(ReceiptPayment::getCreateTime, startOfNextMonth);
+
+ LambdaQueryWrapper<InvoiceLedger> invoiceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ invoiceLedgerLambdaQueryWrapper.ge(InvoiceLedger::getCreateTime, startOfMonth)
+ .lt(InvoiceLedger::getCreateTime, startOfNextMonth);
+
+ // 鑾峰彇鍥炴閲戦
+ List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.selectList(receiptPaymentLambdaQueryWrapper);
+ //寮�绁ㄩ噾棰�
+ List<InvoiceLedger> invoiceLedgerList = invoiceLedgerMapper.selectList(invoiceLedgerLambdaQueryWrapper);
+
+ // 浣跨敤 Stream 姹傚拰
+ BigDecimal invoiceAmount = invoiceLedgerList.stream()
+ .map(InvoiceLedger::getInvoiceTotal)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal receiptAmount = receiptPaymentList.stream()
+ .map(ReceiptPayment::getReceiptPaymentAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ MonthlyAmountDto monthlyAmount = new MonthlyAmountDto();
+ monthlyAmount.setMonth(targetMonth.format(DateTimeFormatter.ofPattern("yyyy-MM")));
+ monthlyAmount.setInvoiceAmount(invoiceAmount);
+ monthlyAmount.setReceiptAmount(receiptAmount);
+
+ monthlyAmounts.add(monthlyAmount);
+ }
+ Collections.reverse(monthlyAmounts);
+ return monthlyAmounts;
+ }
+
+ // 鍐呴儴绫荤敤浜庡瓨鍌ㄨ仛鍚堢粨鏋�
+ private static class GroupedCustomer {
+ private final Long customerId;
+ private final String customerName;
+ private BigDecimal totalAmount = BigDecimal.ZERO;
+
+ public GroupedCustomer(Long customerId, String customerName) {
+ this.customerId = customerId;
+ this.customerName = customerName;
+ }
+
+ public void addAmount(BigDecimal amount) {
+ if (amount != null) {
+ this.totalAmount = this.totalAmount.add(amount);
+ }
+ }
+
+ public Long getCustomerId() {
+ return customerId;
+ }
+
+ public String getCustomerName() {
+ return customerName;
+ }
+
+ public BigDecimal getTotalAmount() {
+ return totalAmount;
+ }
}
/**
--
Gitblit v1.9.3