From f0efc10af370936b4db47b8428eb1ca4686431f9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 06 八月 2026 15:11:56 +0800
Subject: [PATCH] feat(home): 添加报表日期范围筛选功能并完善设备维护管理
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 253 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 183 insertions(+), 70 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 e01927c..ac502b8 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -694,36 +694,39 @@
}
@Override
- public List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type) {
- LocalDate today = LocalDate.now();
+ public List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type, String startDateStr, String endDateStr) {
LocalDate startDate;
LocalDate endDate;
- switch (type) {
- case 1: // 鍛�
- startDate = today.with(DayOfWeek.MONDAY);
- endDate = today.with(DayOfWeek.SUNDAY);
- break;
- case 2: // 鏈�
- startDate = today.with(TemporalAdjusters.firstDayOfMonth());
- endDate = today.with(TemporalAdjusters.lastDayOfMonth());
- break;
- case 3: // 瀛ｅ害
- Month currentMonth = today.getMonth();
- Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
- Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
-
- startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
- endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
- break;
- default:
- return new ArrayList<>();
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ startDate = LocalDate.parse(startDateStr);
+ endDate = LocalDate.parse(endDateStr);
+ } else {
+ LocalDate today = LocalDate.now();
+ switch (type) {
+ case 1: // 鍛�
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 2: // 鏈�
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 3: // 瀛ｅ害
+ Month currentMonth = today.getMonth();
+ Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
+ Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
+ startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ default:
+ return new ArrayList<>();
+ }
}
QueryWrapper<PurchaseLedger> queryWrapper = new QueryWrapper<>();
queryWrapper.select("supplier_name", "SUM(contract_amount) as total_amount")
.ge("entry_date", startDate)
.le("entry_date", endDate)
- // .ne("approval_status", 3)
.groupBy("supplier_name")
.orderByDesc("total_amount")
.last("LIMIT 5");
@@ -859,17 +862,81 @@
majorDto.setRate("0.00");
}
+ // 鏌ヨ鍚勪骇鍝佸皬绫荤殑閲囪喘鏁伴噺
+ Map<String, BigDecimal> purchaseDataMap = new java.util.HashMap<>();
+ List<com.ruoyi.dto.MapDto> purchaseDistribution = homeMapper.selectPurchaseCategoryDistribution();
+ if (purchaseDistribution != null) {
+ for (com.ruoyi.dto.MapDto item : purchaseDistribution) {
+ if (item.getName() != null && item.getValue() != null) {
+ purchaseDataMap.put(item.getName(), new BigDecimal(item.getValue()));
+ }
+ }
+ }
+
+ BigDecimal majorTotalChildrenValue = BigDecimal.ZERO;
List<ProductCategoryDistributionDto.MinorCategoryDto> minorDtos = new ArrayList<>();
for (Product minor : children) {
ProductCategoryDistributionDto.MinorCategoryDto minorDto = new ProductCategoryDistributionDto.MinorCategoryDto();
minorDto.setName(minor.getProductName());
- minorDto.setValue("0");
+ BigDecimal minorValue = purchaseDataMap.getOrDefault(minor.getProductName(), BigDecimal.ZERO);
+ minorDto.setValue(minorValue.toString());
minorDto.setRate("0.00");
minorDto.setChildren(new ArrayList<>());
minorDtos.add(minorDto);
+ majorTotalChildrenValue = majorTotalChildrenValue.add(minorValue);
}
majorDto.setChildren(minorDtos);
+ // 浣跨敤瀹為檯閲囪喘鏁版嵁鏇存柊澶х被鐨� value
+ if (majorTotalChildrenValue.compareTo(BigDecimal.ZERO) > 0) {
+ majorDto.setValue(majorTotalChildrenValue.toString());
+ }
majorItems.add(majorDto);
+
+ // 璁＄畻澶х被鍗犳瘮
+ BigDecimal totalAllValue = BigDecimal.ZERO;
+ for (ProductCategoryDistributionDto.MajorCategoryDto m : majorItems) {
+ try {
+ totalAllValue = totalAllValue.add(new BigDecimal(m.getValue()));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ if (totalAllValue.compareTo(BigDecimal.ZERO) > 0) {
+ for (ProductCategoryDistributionDto.MajorCategoryDto m : majorItems) {
+ try {
+ BigDecimal val = new BigDecimal(m.getValue());
+ m.setRate(val.divide(totalAllValue, 4, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_UP)
+ .toString());
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ }
+ // 璁＄畻灏忕被鍗犳瘮锛堝湪鍚屽ぇ绫诲唴锛�
+ for (ProductCategoryDistributionDto.MajorCategoryDto m : majorItems) {
+ if (m.getChildren() == null || m.getChildren().isEmpty()) {
+ continue;
+ }
+ BigDecimal parentVal = BigDecimal.ZERO;
+ for (ProductCategoryDistributionDto.MinorCategoryDto child : m.getChildren()) {
+ try {
+ parentVal = parentVal.add(new BigDecimal(child.getValue()));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ if (parentVal.compareTo(BigDecimal.ZERO) > 0) {
+ for (ProductCategoryDistributionDto.MinorCategoryDto child : m.getChildren()) {
+ try {
+ BigDecimal childVal = new BigDecimal(child.getValue());
+ child.setRate(childVal.divide(parentVal, 4, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_UP)
+ .toString());
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ }
+ }
}
dto.setItems(majorItems);
@@ -877,38 +944,42 @@
}
@Override
- public List<CustomerContributionRankingDto> customerContributionRanking(Integer type) {
- LocalDate today = LocalDate.now();
- LocalDate startDate = null;
- LocalDate endDate = null;
- switch (type) {
- case 1:
- startDate = today.with(DayOfWeek.MONDAY);
- endDate = today.with(DayOfWeek.SUNDAY);
- break;
- case 2:
- startDate = today.with(TemporalAdjusters.firstDayOfMonth());
- endDate = today.with(TemporalAdjusters.lastDayOfMonth());
- break;
- case 3:
- Month currentMonth = today.getMonth();
- Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
- Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
- startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
- endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
- break;
+ public List<CustomerContributionRankingDto> customerContributionRanking(Integer type, String startDateStr, String endDateStr) {
+ LocalDate startDate;
+ LocalDate endDate;
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ startDate = LocalDate.parse(startDateStr);
+ endDate = LocalDate.parse(endDateStr);
+ } else {
+ LocalDate today = LocalDate.now();
+ switch (type) {
+ case 1:
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 2:
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 3:
+ Month currentMonth = today.getMonth();
+ Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();
+ Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);
+ startDate = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.withMonth(lastMonthOfQuarter.getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ default:
+ return new ArrayList<>();
+ }
}
QueryWrapper<SalesLedger> queryWrapper = new QueryWrapper<>();
queryWrapper.select("customer_name", "SUM(contract_amount) as total_amount")
.isNotNull("customer_name")
+ .between("entry_date", startDate, endDate)
.groupBy("customer_name")
.orderByDesc("total_amount")
.last("LIMIT 5");
-
- if (startDate != null && endDate != null) {
- queryWrapper.between("entry_date", startDate, endDate);
- }
List<Map<String, Object>> maps = salesLedgerMapper.selectMaps(queryWrapper);
List<CustomerContributionRankingDto> result = new ArrayList<>();
@@ -924,9 +995,13 @@
}
@Override
- public List<MapDto> productSalesAnalysis() {
- // 鑾峰彇鎵�鏈変骇鍝佸ぇ绫荤殑閿�鍞
- List<Map<String, Object>> analysisResults = salesLedgerProductMapper.selectProductSalesAnalysis();
+ public List<MapDto> productSalesAnalysis(String startDateStr, String endDateStr) {
+ List<Map<String, Object>> analysisResults;
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ analysisResults = salesLedgerProductMapper.selectProductSalesAnalysisByDate(startDateStr, endDateStr);
+ } else {
+ analysisResults = salesLedgerProductMapper.selectProductSalesAnalysis();
+ }
if (CollectionUtils.isEmpty(analysisResults)) {
return new ArrayList<>();
}
@@ -961,9 +1036,13 @@
}
@Override
- public List<MapDto> rawMaterialPurchaseAmountRatio() {
- // 鑾峰彇鎵�鏈夊師鏉愭枡鐨勯噰璐
- List<Map<String, Object>> analysisResults = salesLedgerProductMapper.selectRawMaterialPurchaseAnalysis();
+ public List<MapDto> rawMaterialPurchaseAmountRatio(String startDateStr, String endDateStr) {
+ List<Map<String, Object>> analysisResults;
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ analysisResults = salesLedgerProductMapper.selectRawMaterialPurchaseAnalysisByDate(startDateStr, endDateStr);
+ } else {
+ analysisResults = salesLedgerProductMapper.selectRawMaterialPurchaseAnalysis();
+ }
if (CollectionUtils.isEmpty(analysisResults)) {
return new ArrayList<>();
}
@@ -998,25 +1077,47 @@
}
@Override
- public List<MapDto> salesPurchaseStorageProductCount() {
+ public List<MapDto> salesPurchaseStorageProductCount(String startDate, String endDate) {
LocalDateTime now = LocalDateTime.now();
- LocalDateTime currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
- LocalDateTime lastMonth = now.minusMonths(1);
- LocalDateTime lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
- LocalDateTime lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);
+ LocalDateTime currentMonthStart;
+ LocalDateTime currentMonthEnd;
+ LocalDateTime lastMonthStart;
+ LocalDateTime lastMonthEnd;
- // 閿�鍞�
- int currentSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, currentMonthStart, now);
- int lastSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, lastMonthStart, lastMonthEnd);
- // 閲囪喘
- int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart, now);
+ if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
+ LocalDate start = LocalDate.parse(startDate);
+ LocalDate end = LocalDate.parse(endDate);
+ currentMonthStart = start.atStartOfDay();
+ currentMonthEnd = end.atTime(LocalTime.MAX);
+ long daysBetween = java.time.temporal.ChronoUnit.DAYS.between(start, end) + 1;
+ LocalDate lastStart = start.minusDays(daysBetween);
+ LocalDate lastEnd = start.minusDays(1);
+ lastMonthStart = lastStart.atStartOfDay();
+ lastMonthEnd = lastEnd.atTime(LocalTime.MAX);
+ } else {
+ currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
+ currentMonthEnd = now;
+ LocalDateTime lastMonth = now.minusMonths(1);
+ lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
+ lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);
+ }
+
+ // 閿�鍞鍗曟暟锛堢粺璁ales_ledger琛級
+ int currentSales = Math.toIntExact(salesLedgerMapper.selectCount(new LambdaQueryWrapper<SalesLedger>()
+ .ge(SalesLedger::getEntryDate, currentMonthStart)
+ .le(SalesLedger::getEntryDate, currentMonthEnd)));
+ int lastSales = Math.toIntExact(salesLedgerMapper.selectCount(new LambdaQueryWrapper<SalesLedger>()
+ .ge(SalesLedger::getEntryDate, lastMonthStart)
+ .le(SalesLedger::getEntryDate, lastMonthEnd)));
+ // 閲囪喘浜у搧鏁�
+ int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart, currentMonthEnd);
int lastPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, lastMonthStart, lastMonthEnd);
- // 鍌ㄥ瓨
- int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, now);
+ // 鍌ㄥ瓨浜у搧鏁�
+ int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, currentMonthEnd);
int lastStorage = stockInventoryMapper.selectStorageProductCountByDate(lastMonthStart, lastMonthEnd);
List<MapDto> list = new ArrayList<>();
- list.add(createMapDto("閿�鍞骇鍝佹暟", currentSales, lastSales));
+ list.add(createMapDto("閿�鍞鍗曟暟", currentSales, lastSales));
list.add(createMapDto("閲囪喘浜у搧鏁�", currentPurchase, lastPurchase));
list.add(createMapDto("鍌ㄥ瓨浜у搧鏁�", currentStorage, lastStorage));
@@ -1045,7 +1146,7 @@
}
@Override
- public List<Map<String, Object>> productInOutAnalysis(Integer type) {
+ public List<Map<String, Object>> productInOutAnalysis(Integer type, String startDateStr, String endDateStr) {
String targetName;
if (type == 1) {
targetName = "鍘熸潗鏂�";
@@ -1070,8 +1171,17 @@
LocalDate now = LocalDate.now();
DateTimeFormatter displayDtf = DateTimeFormatter.ofPattern("M/d");
- String startDate = now.minusDays(6).toString();
- String endDate = now.toString();
+ LocalDate start;
+ LocalDate end;
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ start = LocalDate.parse(startDateStr);
+ end = LocalDate.parse(endDateStr);
+ } else {
+ end = now;
+ start = now.minusDays(6);
+ }
+ String startDate = start.toString();
+ String endDate = end.toString();
List<Map<String, Object>> inCounts = stockInventoryMapper.selectDailyStockInCounts(rootCategoryId, startDate,
endDate + " 23:59:59");
@@ -1108,7 +1218,10 @@
}
@Override
- public List<MapDto> productTurnoverDays() {
+ public List<MapDto> productTurnoverDays(String startDateStr, String endDateStr) {
+ if (com.ruoyi.common.utils.StringUtils.isNotBlank(startDateStr) && com.ruoyi.common.utils.StringUtils.isNotBlank(endDateStr)) {
+ return homeMapper.productTurnoverDaysByDate(startDateStr, endDateStr);
+ }
return homeMapper.productTurnoverDays();
}
--
Gitblit v1.9.3