From 37e17957e82ea4263298b9651eb70dd1e093584e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 02 六月 2026 15:42:42 +0800
Subject: [PATCH] fix: 生产工单时间需要加上时分秒、销售台账加上业务员筛选条件
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 f09323d..fbd1e65 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -178,43 +178,46 @@
BigDecimal noInvoiceAmountTotal = salesLedgerProducts.stream().map(SalesLedgerProduct::getNoInvoiceAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- homeBusinessDto.setMonthSaleMoney(contractAmount.setScale(2, RoundingMode.HALF_UP).toString());
- homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal.setScale(2, RoundingMode.HALF_UP).toString());
+ homeBusinessDto.setMonthSaleMoney(contractAmount.setScale(3, RoundingMode.HALF_UP).toString());
+ homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal.setScale(3, RoundingMode.HALF_UP).toString());
}
// 鍒涘缓LambdaQueryWrapper
LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ge(PurchaseLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
.lt(PurchaseLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
- // 鎵ц鏌ヨ骞惰绠楁�诲拰
+
List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(queryWrapper);
if (!CollectionUtils.isEmpty(purchaseLedgers)) {
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();
- salesLedgerProductMapperLambdaQueryWrapperCopy.eq(SalesLedgerProduct::getType, 2)
+ LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<>();
+ salesLedgerProductMapperLambdaQueryWrapperCopy.eq(SalesLedgerProduct::getType, 2) // 閲囪喘绫诲瀷
.in(SalesLedgerProduct::getSalesLedgerId,
purchaseLedgers.stream().map(PurchaseLedger::getId).collect(Collectors.toList()));
+
List<SalesLedgerProduct> salesLedgerProductsCopy = salesLedgerProductMapper
.selectList(salesLedgerProductMapperLambdaQueryWrapperCopy);
- // 鍚堣鍚堝悓閲戦
+
+ // 鍚堣鍚堝悓鎬婚噾棰�
BigDecimal receiveAmount = purchaseLedgers.stream()
.map(PurchaseLedger::getContractAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鏈紑绁ㄩ噾棰�
+
+ // 寰呬粯娆炬�婚噾棰�
BigDecimal unReceiptPaymentAmount = salesLedgerProductsCopy.stream()
- .map(SalesLedgerProduct::getNoInvoiceAmount)
+ .map(SalesLedgerProduct::getPendingTicketsTotal)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- homeBusinessDto.setMonthPurchaseMoney(receiveAmount.setScale(2, RoundingMode.HALF_UP).toString());
- homeBusinessDto
- .setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());
+
+ homeBusinessDto.setMonthPurchaseMoney(receiveAmount.setScale(3, RoundingMode.HALF_UP).toString());
+ homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(3, RoundingMode.HALF_UP).toString());
}
// 缁熻搴撳瓨
BigDecimal stockQuantityTotal = stockInventoryMapper.selectTotal();
- homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(2, RoundingMode.HALF_UP).toString());
+ homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(3, RoundingMode.HALF_UP).toString());
// 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
BigDecimal bigDecimal = stockInventoryMapper.selectTotalByDate(LocalDate.now());
- homeBusinessDto.setTodayInventoryNum(bigDecimal.setScale(2, RoundingMode.HALF_UP).toString());
+ homeBusinessDto.setTodayInventoryNum(bigDecimal.setScale(3, RoundingMode.HALF_UP).toString());
return homeBusinessDto;
}
@@ -295,8 +298,12 @@
analysisCustomerContractAmountsDto.setChain(chain);
Map<String, BigDecimal> collect = salesLedgers.stream()
- .collect(Collectors.groupingBy(SalesLedger::getCustomerName, Collectors.reducing(BigDecimal.ZERO,
- SalesLedger::getContractAmount, BigDecimal::add)));
+ .collect(Collectors.groupingBy(
+ salesLedger -> StringUtils.isBlank(salesLedger.getCustomerName()) ? "鏈垎閰嶅鎴�" : salesLedger.getCustomerName(),
+ Collectors.reducing(BigDecimal.ZERO,
+ salesLedger -> Objects.nonNull(salesLedger.getContractAmount())
+ ? salesLedger.getContractAmount() : BigDecimal.ZERO,
+ BigDecimal::add)));
List<MapDto> mapDtos = new ArrayList<>();
collect.forEach((k, v) -> {
MapDto mapDto = new MapDto();
@@ -581,8 +588,8 @@
public ProductionTurnoverDto workInProcessTurnover() {
ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();
ProductWorkOrderDto workOrder = new ProductWorkOrderDto();
- workOrder.setPlanStartTime(LocalDate.now().minusMonths(1));
- workOrder.setPlanEndTime(LocalDate.now());
+ workOrder.setPlanStartTime(LocalDateTime.now().minusMonths(1));
+ workOrder.setPlanEndTime(LocalDateTime.now());
List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper
.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();
long sum = productWorkOrders.stream()
@@ -1587,23 +1594,23 @@
@Override
public List<MapDto> processOutputAnalysis(Integer type) {
LocalDate today = LocalDate.now();
- LocalDate startDate;
- LocalDate endDate = today;
+ LocalDateTime startDate;
+ LocalDateTime endDate = today.atTime(23, 59, 59);
switch (type) {
case 1: // 鍛�
- startDate = today.with(DayOfWeek.MONDAY);
+ startDate = today.with(DayOfWeek.MONDAY).atStartOfDay();
break;
case 2: // 鏈�
- startDate = today.withDayOfMonth(1);
+ startDate = today.withDayOfMonth(1).atStartOfDay();
break;
case 3: // 瀛ｅ害
int currentMonth = today.getMonthValue();
int startMonth = ((currentMonth - 1) / 3) * 3 + 1;
- startDate = LocalDate.of(today.getYear(), startMonth, 1);
+ startDate = LocalDate.of(today.getYear(), startMonth, 1).atStartOfDay();
break;
default:
- startDate = today.with(DayOfWeek.MONDAY);
+ startDate = today.with(DayOfWeek.MONDAY).atStartOfDay();
break;
}
--
Gitblit v1.9.3