From 7944fe0c62ad8ac73bfc46b44bdc243c78158abb Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 17:38:27 +0800
Subject: [PATCH] 销售订单数据排除反审
---
src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java | 5 +++--
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 4 +++-
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 25 +++++++++++++++----------
5 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index e030833..24d8bc1 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -151,7 +151,8 @@
// 鍒涘缓LambdaQueryWrapper
LambdaQueryWrapper<SalesLedger> salesLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
salesLedgerLambdaQueryWrapper.ge(SalesLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
- .lt(SalesLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
+ .lt(SalesLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()) // 灏忎簬涓嬫湀绗竴澶�
+ .ne(SalesLedger::getReviewStatus, 2); // 鎺掗櫎鍙嶅鏍告暟鎹�
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(salesLedgerLambdaQueryWrapper);
if (!CollectionUtils.isEmpty(salesLedgers)) {
// 鍚堣鍚堝悓閲戦
@@ -213,7 +214,7 @@
@Override
public AnalysisCustomerContractAmountsDto analysisCustomerContractAmounts() {
- List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>().ne(SalesLedger::getReviewStatus, 2));
// 鍚堣鍚堝悓閲戦
BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
@@ -229,7 +230,8 @@
LocalDate endOfWeek = today.with(DayOfWeek.SUNDAY);
List<SalesLedger> salesLedgers1 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
.ge(SalesLedger::getEntryDate, startOfWeek) // 澶т簬绛変簬鏈懆鍛ㄤ竴
- .lt(SalesLedger::getEntryDate, endOfWeek.plusDays(1))); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈鍛ㄦ棩
+ .lt(SalesLedger::getEntryDate, endOfWeek.plusDays(1))
+ .ne(SalesLedger::getReviewStatus, 2)); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈鍛ㄦ棩
BigDecimal weekContractAmount = salesLedgers1.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -238,7 +240,8 @@
LocalDate lastYearEndOfWeek = today.minusYears(1).with(DayOfWeek.SUNDAY);
List<SalesLedger> salesLedgers2 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
.ge(SalesLedger::getEntryDate, lastYearStartOfWeek) // 澶т簬绛変簬鍘诲勾鏈懆鍛ㄤ竴
- .lt(SalesLedger::getEntryDate, lastYearEndOfWeek.plusDays(1))); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈鍛ㄦ棩
+ .lt(SalesLedger::getEntryDate, lastYearEndOfWeek.plusDays(1))
+ .ne(SalesLedger::getReviewStatus, 2)); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈鍛ㄦ棩
BigDecimal lastYearWeekContractAmount = salesLedgers2.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -258,13 +261,15 @@
LocalDate plusDays = today.plusDays(1);
List<SalesLedger> salesLedgers3 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
.ge(SalesLedger::getEntryDate, today) // 澶т簬绛変簬浠婂ぉ
- .lt(SalesLedger::getEntryDate, plusDays)); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈褰撳ぉ
+ .lt(SalesLedger::getEntryDate, plusDays)
+ .ne(SalesLedger::getReviewStatus, 2)); // 淇敼锛氫娇鐢� lt 骞跺姞涓婁竴澶╂潵鍖呭惈褰撳ぉ
BigDecimal todayContractAmount = salesLedgers3.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
List<SalesLedger> salesLedgers4 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
.ge(SalesLedger::getEntryDate, yesterday) // 澶т簬绛変簬鏄ㄥぉ
- .lt(SalesLedger::getEntryDate, today)); // 淇敼锛氫娇鐢� lt 鑰屼笉鏄� gt
+ .lt(SalesLedger::getEntryDate, today)
+ .ne(SalesLedger::getReviewStatus, 2)); // 淇敼锛氫娇鐢� lt 鑰屼笉鏄� gt
BigDecimal lastYearYesterdayContractAmount = salesLedgers4.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -503,8 +508,7 @@
}
// 搴旀敹
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
- // .ge(SalesLedger::getEntryDate, startDate)
- // .lt(SalesLedger::getEntryDate, endDate)
+ .ne(SalesLedger::getReviewStatus, 2) // 鎺掗櫎鍙嶅鏍告暟鎹�
);
// BigDecimal receivableMoney =
// salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO,
@@ -799,7 +803,8 @@
List<SalesLedger> list = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
.eq(SalesLedger::getCustomerId, customerId)
.ge(SalesLedger::getEntryDate, start)
- .le(SalesLedger::getEntryDate, end));
+ .le(SalesLedger::getEntryDate, end)
+ .ne(SalesLedger::getReviewStatus, 2));
if (groupByMonth) {
for (int i = 0; i < 3; i++) {
@@ -2487,4 +2492,4 @@
return productProcessMapper.calculateProductionStatistics(startDateTime, endDateTime, userId, processIds);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
index f1edcc2..9fb340b 100644
--- a/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/SalesLedgerMapper.java
@@ -70,7 +70,8 @@
"SUM(CASE WHEN slp.approve_status = 2 THEN 1 ELSE 0 END) / COUNT(DISTINCT sl.id) * 100), 2) AS ship_rate " +
"FROM sales_ledger sl " +
"LEFT JOIN sales_ledger_product slp ON sl.id = slp.sales_ledger_id " +
- "WHERE sl.entry_date >= DATE_FORMAT(#{statisticsTableDto.entryDateStart}, '%Y-%m-01') " +
+ "WHERE sl.review_status != 2 " +
+ "AND sl.entry_date >= DATE_FORMAT(#{statisticsTableDto.entryDateStart}, '%Y-%m-01') " +
"AND sl.entry_date <= LAST_DAY(#{statisticsTableDto.entryDateEnd}) " +
// 浜у搧澶х被绛涢��
"<if test='statisticsTableDto.productCategory != null and statisticsTableDto.productCategory != \"\"'>" +
@@ -89,4 +90,4 @@
List<SalesLedgerProcessRoute> selectSalesProcess(Long salesLedgerId);
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
index 010dec0..e3b5926 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
@@ -37,7 +37,7 @@
private ShippingInfoMapper shippingInfoMapper;
public AjaxResult total() {
- List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>().ne(SalesLedger::getReviewStatus, 2));
if(CollectionUtils.isEmpty(salesLedgers)) return AjaxResult.success(salesLedgers);
Map<String, Object> map = new HashMap<>();
// 閿�鍞
@@ -129,4 +129,4 @@
map.put("shippingRateList", shippingRateList);
return AjaxResult.success(map);
}
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 56c8372..efe29fb 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -272,7 +272,7 @@
@Override
public Map<String,BigDecimal> getAmountMouth() {
- List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
+ List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>().ne(SalesLedger::getReviewStatus, 2));
BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -354,4 +354,4 @@
}
}
-}
+}
\ No newline at end of file
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 ac676ab..1bd4a41 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -331,7 +331,9 @@
public List getTopFiveList() {
// 鏌ヨ鍘熷鏁版嵁
LambdaQueryWrapper<SalesLedger> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(SalesLedger::getCustomerId, SalesLedger::getCustomerName, SalesLedger::getContractAmount).orderByDesc(SalesLedger::getContractAmount);
+ queryWrapper.select(SalesLedger::getCustomerId, SalesLedger::getCustomerName, SalesLedger::getContractAmount)
+ .orderByDesc(SalesLedger::getContractAmount)
+ .ne(SalesLedger::getReviewStatus, 2); // 鎺掗櫎鍙嶅鏍告暟鎹�
List<SalesLedger> records = salesLedgerMapper.selectList(queryWrapper);
// 鎸夊鎴稩D鍒嗙粍骞惰仛鍚堥噾棰�
--
Gitblit v1.9.3