From 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 17:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 832 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 702 insertions(+), 130 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 7dea6df..3b48ec4 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -1,21 +1,40 @@
package com.ruoyi.home.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.mapper.CustomerMapper;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.mapper.SupplierManageMapper;
+import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.basic.pojo.SupplierManage;
+import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
+import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.device.mapper.DeviceRepairMapper;
+import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.dto.MapDto;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
-import com.ruoyi.lavorissue.pojo.LaborIssue;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
-import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
-import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductWorkOrderDto;
+import com.ruoyi.production.mapper.ProductOrderMapper;
+import com.ruoyi.production.mapper.ProductWorkOrderMapper;
+import com.ruoyi.production.pojo.ProductWorkOrder;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUserDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -25,9 +44,13 @@
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,11 +59,11 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.time.*;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -61,9 +84,6 @@
private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
- private ProcurementRecordOutMapper procurementRecordOutMapper;
-
- @Autowired
private ProcurementRecordMapper procurementRecordStorageMapper;
@Autowired
@@ -79,10 +99,30 @@
private PaymentRegistrationMapper paymentRegistrationMapper;
@Autowired
- private LavorIssueMapper lavorIssueMapper;
+ private SysDeptMapper sysDeptMapper;
@Autowired
- private SysDeptMapper sysDeptMapper;
+ private NoticeMapper noticeMapper;
+ @Autowired
+ private ProductOrderMapper productOrderMapper;
+ @Autowired
+ private ProductWorkOrderMapper productWorkOrderMapper;
+ @Autowired
+ private ProductModelMapper productModelMapper;
+ @Autowired
+ private ProductMapper productMapper;
+ @Autowired
+ private StockUtils stockUtils;
+ @Autowired
+ private StaffOnJobMapper staffOnJobMapper;
+ @Autowired
+ private CustomerMapper customerMapper;
+ @Autowired
+ private SupplierManageMapper supplierManageMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
@Override
public HomeBusinessDto business() {
@@ -95,61 +135,76 @@
salesLedgerLambdaQueryWrapper.ge(SalesLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
.lt(SalesLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(salesLedgerLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(salesLedgers)){
- return homeBusinessDto;
+ if(!CollectionUtils.isEmpty(salesLedgers)){
+ // 鍚堣鍚堝悓閲戦
+ BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>();
+ salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 1)
+ .in(SalesLedgerProduct::getSalesLedgerId, salesLedgers.stream().map(SalesLedger::getId).collect(Collectors.toList()));
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapper);
+ // 鏈紑绁ㄩ噾棰�
+ 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());
}
- // 鍚堣鍚堝悓閲戦
- BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>();
- salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 1)
- .in(SalesLedgerProduct::getSalesLedgerId, salesLedgers.stream().map(SalesLedger::getId).collect(Collectors.toList()));
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapper);
- // 鏈紑绁ㄩ噾棰�
- 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());
// 鍒涘缓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)){
- return homeBusinessDto;
+ if(!CollectionUtils.isEmpty(purchaseLedgers)){
+ LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();
+ 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)
+ .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());
+ }
+ // 缁熻搴撳瓨
+// List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
+// BigDecimal stockAmount = procurementRecordStorages.stream()
+// .map(ProcurementRecordStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// // 鑷畾涔夊簱瀛�
+// List<CustomStorage> customStorages = customStorageMapper.selectList(null);
+// BigDecimal customStockAmount = customStorages.stream()
+// .map(CustomStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
+// BigDecimal outboundAmount = procurementRecordOuts.stream()
+// .map(ProcurementRecordOut::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);
+ IPage<ProductModel> productModelIPage = productModelMapper.listPageProductModel(new Page<>(1, -1), new ProductModel());
+ if(!CollectionUtils.isEmpty(productModelIPage.getRecords())){
+ //鑾峰彇瑙勬牸id
+ List<Long> modelIds = productModelIPage.getRecords().stream().map(ProductModel::getId).collect(Collectors.toList());
+ BigDecimal stockQuantityTotal = modelIds.stream()
+ .map(stockUtils::getStockQuantity)
+ .map(map -> map.get("stockQuantity"))
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(2, RoundingMode.HALF_UP).toString());
}
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();
- salesLedgerProductMapperLambdaQueryWrapper.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)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
- // 缁熻搴撳瓨
- List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
- BigDecimal stockAmount = procurementRecordStorages.stream()
- .map(ProcurementRecordStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
- BigDecimal outboundAmount = procurementRecordOuts.stream()
- .map(ProcurementRecordOut::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal stock = stockAmount.subtract(outboundAmount);
// 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
@@ -159,10 +214,7 @@
.map(ProcurementRecordStorage::getInboundNum)
.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.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
+// homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());
return homeBusinessDto;
}
@@ -261,50 +313,83 @@
@Override
public QualityStatisticsDto qualityStatistics() {
- // 鑾峰彇涓�鍛ㄦ暟鎹�
- // 鑾峰彇褰撳墠鏃堕棿
+ // 鑾峰彇杩戝洓涓湀鏁版嵁锛堝線鍓嶆帹涓変釜鏈堬紝鍏�4涓畬鏁存湀浠斤級
LocalDate today = LocalDate.now();
- // 鑾峰彇鏈懆鍛ㄤ竴
- LocalDate startOfWeek = today.with(DayOfWeek.MONDAY);
- // 鑾峰彇鏈懆鍛ㄦ棩
- LocalDate endOfWeek = today.with(DayOfWeek.SUNDAY);
- LambdaQueryWrapper<QualityInspect> qualityInspectLambdaQueryWrapper = new LambdaQueryWrapper<>();
- qualityInspectLambdaQueryWrapper.ge(QualityInspect::getCheckTime, startOfWeek)
- .gt(QualityInspect::getCheckTime, endOfWeek);
- List<QualityInspect> qualityInspects = qualityStatisticsMapper.selectList(qualityInspectLambdaQueryWrapper);
+ // 瀹氫箟鏃ユ湡鏍煎紡鍖栧櫒锛堢敤浜庢樉绀衡�滃勾鏈堚�濇牸寮忥級
+ DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM");
+
QualityStatisticsDto qualityStatisticsDto = new QualityStatisticsDto();
- qualityStatisticsDto.setSupplierNum(qualityInspects.stream().filter(item -> item.getInspectType().equals(0)).map(QualityInspect::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
- qualityStatisticsDto.setProcessNum(qualityInspects.stream().filter(item -> item.getInspectType().equals(1)).map(QualityInspect::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
- qualityStatisticsDto.setFactoryNum(qualityInspects.stream().filter(item -> item.getInspectType().equals(2)).map(QualityInspect::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add));
List<QualityStatisticsItem> qualityStatisticsItems = new ArrayList<>();
- for (int j = 1; j < 8; j++) {
- LocalDate endTime = startOfWeek.plusDays(j);
- LocalDate startTime = endTime.minusDays(1);
- QualityStatisticsItem qualityStatisticsItem = new QualityStatisticsItem();
- qualityStatisticsItem.setDate(startTime.toString());
- qualityStatisticsItem.setSupplierNum(qualityInspects.stream()
- .filter(item -> item.getInspectType().equals(0) && "涓嶅悎鏍�".equals(item.getCheckResult())
- && (startTime.isEqual(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) || startTime.isAfter(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
- && endTime.isBefore(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
+
+ BigDecimal supplierNum = new BigDecimal(0);
+ BigDecimal factoryNum = new BigDecimal(0);
+ BigDecimal processNum = new BigDecimal(0);
+ // 寰幆4娆★紝鍒嗗埆缁熻杩�4涓湀鐨勬暟鎹紙褰撳墠鏈堛�佸墠1涓湀銆佸墠2涓湀銆佸墠3涓湀锛�
+ for (int i = 3; i >= 0; i--) {
+ // 璁＄畻褰撳墠寰幆瀵瑰簲鐨勬湀浠斤紙i=0锛氬綋鍓嶆湀锛宨=1锛氬墠1涓湀锛屼互姝ょ被鎺級
+ LocalDate currentMonth = today.minusMonths(i);
+ // 褰撴湀鐨勫紑濮嬫棩鏈燂紙姣忔湀1鍙凤級
+ LocalDate monthStart = currentMonth.withDayOfMonth(1);
+ // 褰撴湀鐨勭粨鏉熸棩鏈燂紙姣忔湀鏈�鍚庝竴澶╋級
+ LocalDate monthEnd = currentMonth.withDayOfMonth(currentMonth.lengthOfMonth());
+
+ // 鏋勫缓褰撴湀鐨勬煡璇㈡潯浠讹紙濡傛灉鎯充竴娆℃�ф煡鍏�4涓湀鏁版嵁鍐嶅唴瀛樼瓫閫夛紝鍙紭鍖栦负鍏堟煡鍏ㄥ啀寰幆绛涢�夛級
+ LambdaQueryWrapper<QualityInspect> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.ge(QualityInspect::getCheckTime, monthStart)
+ .le(QualityInspect::getCheckTime, monthEnd); // 绛涢�夊綋鏈堟暟鎹�
+ List<QualityInspect> monthInspects = qualityStatisticsMapper.selectList(queryWrapper);
+ BigDecimal reduce = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(0))
.map(QualityInspect::getQuantity)
- .reduce(BigDecimal.ZERO, BigDecimal::add)
- );
- qualityStatisticsItem.setFactoryNum(qualityInspects.stream()
- .filter(item -> item.getInspectType().equals(1) && "涓嶅悎鏍�".equals(item.getCheckResult())
- && (startTime.isEqual(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) || startTime.isAfter(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
- && endTime.isBefore(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ supplierNum = supplierNum.add(reduce);
+ BigDecimal reduce1 = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(1))
.map(QualityInspect::getQuantity)
- .reduce(BigDecimal.ZERO, BigDecimal::add)
- );
- qualityStatisticsItem.setProcessNum(qualityInspects.stream()
- .filter(item -> item.getInspectType().equals(2) && "涓嶅悎鏍�".equals(item.getCheckResult())
- && (startTime.isEqual(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()) || startTime.isAfter(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
- && endTime.isBefore(item.getCheckTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate()))
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ processNum= processNum.add(reduce1);
+ BigDecimal reduce2 = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(2))
.map(QualityInspect::getQuantity)
- .reduce(BigDecimal.ZERO, BigDecimal::add));
- qualityStatisticsItems.add(qualityStatisticsItem);
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ factoryNum = factoryNum.add(reduce2);
+
+ // 鏋勫缓褰撴湀缁熻椤�
+ QualityStatisticsItem item = new QualityStatisticsItem();
+ item.setDate(monthStart.format(monthFormatter)); // 鏃ユ湡鏄剧ず涓衡�滃勾鏈堚�濓紙濡� 2025-10锛�
+
+ // 1. 渚涘簲鍟嗘楠岋紙绫诲瀷0锛�- 鍚堟牸鏁伴噺
+ BigDecimal supplierQualified = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(0)
+ && "鍚堟牸".equals(inspect.getCheckResult()))
+ .map(QualityInspect::getQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ item.setSupplierNum(supplierQualified);
+
+ // 2. 宸ュ簭妫�楠岋紙绫诲瀷1锛�- 鍚堟牸鏁伴噺
+ BigDecimal processQualified = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(1)
+ && "鍚堟牸".equals(inspect.getCheckResult()))
+ .map(QualityInspect::getQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ item.setProcessNum(processQualified);
+
+ // 3. 宸ュ巶妫�楠岋紙绫诲瀷2锛�- 鍚堟牸鏁伴噺
+ BigDecimal factoryQualified = monthInspects.stream()
+ .filter(inspect -> inspect.getInspectType().equals(2)
+ && "鍚堟牸".equals(inspect.getCheckResult()))
+ .map(QualityInspect::getQuantity)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ item.setFactoryNum(factoryQualified);
+
+ qualityStatisticsItems.add(item);
}
+ // 缁熻杩�4涓湀鎬绘暟鎹紙鎵�鏈夋湀浠芥眹鎬伙級
+ qualityStatisticsDto.setProcessNum(processNum);
+ qualityStatisticsDto.setSupplierNum(supplierNum);
+ qualityStatisticsDto.setFactoryNum(factoryNum);
qualityStatisticsDto.setItem(qualityStatisticsItems);
+
return qualityStatisticsDto;
}
@@ -314,29 +399,29 @@
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0)
.eq(ApproveProcess::getApproveUserCurrentId, loginUser.getUserId())
- .ne(ApproveProcess::getApproveStatus, 2)
- .eq(ApproveProcess::getTenantId, loginUser.getTenantId());
+ .ne(ApproveProcess::getApproveStatus, 2);
+// .eq(ApproveProcess::getTenantId, loginUser.getTenantId());
List<ApproveProcess> approveProcesses = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);
if(CollectionUtils.isEmpty(approveProcesses)){
approveProcesses = new ArrayList<>();
}
- // 鏌ヨ鏈鐢ㄥ姵淇濊褰�
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-
- LaborIssue laborIssue1 = new LaborIssue();
- laborIssue1.setAdoptedDate(new Date());
- laborIssue1.setIssueDate(sdf.parse(sdf.format(new Date())));
- List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue1);
- if(!CollectionUtils.isEmpty(laborIssues)){
- for (LaborIssue laborIssue : laborIssues) {
- ApproveProcess approveProcess = new ApproveProcess();
- approveProcess.setApproveId(laborIssue.getOrderNo());
- approveProcess.setApproveDeptName(sysDeptMapper.selectDeptById(loginUser.getTenantId()).getDeptName());
- approveProcess.setApproveTime(laborIssue.getIssueDate());
- approveProcess.setApproveReason(laborIssue.getDictTypeName() + "-" + laborIssue.getDictName() + "瓒呮椂鏈鍙�");
- approveProcesses.add(approveProcess);
- }
- }
+// // 鏌ヨ鏈鐢ㄥ姵淇濊褰�
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//
+// LaborIssue laborIssue1 = new LaborIssue();
+// laborIssue1.setAdoptedDate(new Date());
+// laborIssue1.setIssueDate(sdf.parse(sdf.format(new Date())));
+// List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue1); //staff_join_leave_record琛ㄨ鍒犻櫎
+// if(!CollectionUtils.isEmpty(laborIssues)){
+// for (LaborIssue laborIssue : laborIssues) {
+// ApproveProcess approveProcess = new ApproveProcess();
+// approveProcess.setApproveId(laborIssue.getOrderNo());
+// approveProcess.setApproveDeptName(sysDeptMapper.selectDeptById(loginUser.getTenantId()).getDeptName());
+// approveProcess.setApproveTime(laborIssue.getIssueDate());
+// approveProcess.setApproveReason(laborIssue.getDictTypeName() + "-" + laborIssue.getDictName() + "瓒呮椂鏈鍙�");
+// approveProcesses.add(approveProcess);
+// }
+// }
return approveProcesses;
}
@@ -374,32 +459,519 @@
}
// 搴旀敹
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
- .ge(SalesLedger::getEntryDate, startDate)
- .lt(SalesLedger::getEntryDate, endDate)
+// .ge(SalesLedger::getEntryDate, startDate)
+// .lt(SalesLedger::getEntryDate, endDate)
);
- BigDecimal receivableMoney = salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal receivableMoney = salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal receivableMoney = sumAmount(salesLedgers, SalesLedger::getContractAmount);
// 搴斾粯
List<PurchaseLedger> procurementRecords = purchaseLedgerMapper.selectList(new LambdaQueryWrapper<PurchaseLedger>()
- .ge(PurchaseLedger::getEntryDate, startDate)
- .lt(PurchaseLedger::getEntryDate, endDate)
+// .ge(PurchaseLedger::getEntryDate, startDate)
+// .lt(PurchaseLedger::getEntryDate, endDate)
);
- BigDecimal payableMoney = procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal payableMoney = procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal payableMoney = sumAmount(procurementRecords, PurchaseLedger::getContractAmount);
// 棰勬敹
List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
- .ge(ReceiptPayment::getReceiptPaymentDate, startDate)
- .lt(ReceiptPayment::getReceiptPaymentDate, endDate));
- BigDecimal advanceMoney = receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+// .ge(ReceiptPayment::getReceiptPaymentDate, startDate)
+// .lt(ReceiptPayment::getReceiptPaymentDate, endDate)
+ );
+// BigDecimal advanceMoney = receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal advanceMoney = sumAmount(receiptPayments, ReceiptPayment::getReceiptPaymentAmount);
// 棰勪粯
List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new LambdaQueryWrapper<PaymentRegistration>()
- .ge(PaymentRegistration::getPaymentDate, startDate)
- .lt(PaymentRegistration::getPaymentDate, endDate));
- BigDecimal prepayMoney = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+// .ge(PaymentRegistration::getPaymentDate, startDate)
+// .lt(PaymentRegistration::getPaymentDate, endDate)
+ );
+// BigDecimal prepayMoney = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal prepayMoney = sumAmount(paymentRegistrations, PaymentRegistration::getCurrentPaymentAmount);
StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();
- statisticsReceivablePayableDto.setPayableMoney(payableMoney);
- statisticsReceivablePayableDto.setReceivableMoney(receivableMoney);
+ statisticsReceivablePayableDto.setPayableMoney(payableMoney.subtract(prepayMoney));
+ statisticsReceivablePayableDto.setReceivableMoney(receivableMoney.subtract(advanceMoney));
statisticsReceivablePayableDto.setAdvanceMoney(advanceMoney);
statisticsReceivablePayableDto.setPrepayMoney(prepayMoney);
return statisticsReceivablePayableDto;
}
+ public static <T> BigDecimal sumAmount(List<T> list, java.util.function.Function<T, BigDecimal> amountExtractor) {
+ return list.stream()
+ // 鎻愬彇閲戦鏃讹紝灏唍ull鏇挎崲涓築igDecimal.ZERO
+ .map(item -> Optional.ofNullable(amountExtractor.apply(item)).orElse(BigDecimal.ZERO))
+ // 绱姞锛屽垵濮嬪�间负0锛岄伩鍏嶇┖娴侀棶棰�
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+ @Autowired
+ private DeviceRepairMapper deviceRepairMapper;
+
+ @Override
+ public Map<String, Object> approveAndDeviceTodos() {
+ // 瀹℃壒鍗忓悓寰呭姙
+ Long aLong = approveProcessMapper.selectCount(new LambdaQueryWrapper<ApproveProcess>()
+ .eq(ApproveProcess::getApproveUserCurrentId, SecurityUtils.getUserId())
+ .eq(ApproveProcess::getApproveDelete, 0)
+ .in(ApproveProcess::getApproveStatus, 0, 1, 3));
+ // 璁惧鎶ヤ慨寰呭姙
+ Long aLong1 = deviceRepairMapper.selectCount(new LambdaQueryWrapper<DeviceRepair>()
+ .eq(DeviceRepair::getStatus, 0)
+ .eq(DeviceRepair::getRepairName, SecurityUtils.getLoginUser().getNickName()));
+ return new HashMap<String, Object>() {{
+ put("approveTodo", aLong);
+ put("deviceRepairTodo", aLong1);
+ }};
+ }
+
+ @Override
+ public Long noticesCount() {
+ // 鏌ヨ鏈繃鏈熺殑閫氱煡鏁伴噺锛氱姸鎬佷负鍙戝竷涓旇繃鏈熸椂闂村ぇ浜庣瓑浜庡綋鍓嶆棩鏈�
+ return noticeMapper.selectCount(new LambdaQueryWrapper<Notice>()
+ .eq(Notice::getStatus, 1) // 1琛ㄧず鍙戝竷鐘舵��
+ .ge(Notice::getExpirationDate, new Date())); // 杩囨湡鏃堕棿澶т簬绛変簬褰撳墠鏃ユ湡
+ }
+
+ @Override
+ public ProductionProgressDto productionProgress() {
+ ProductionProgressDto productionProgressDto = new ProductionProgressDto();
+ ProductOrderDto orderDto = new ProductOrderDto();
+ orderDto.setStartTime(LocalDateTime.now().minusMonths(1));
+ orderDto.setEndTime(LocalDateTime.now());
+ List<ProductOrderDto> productOrderDtos = productOrderMapper.pageProductOrder(new Page<>(1, -1), orderDto).getRecords();
+ productionProgressDto.setCompletedOrderDetails(productOrderDtos);
+ long totalCount = productOrderDtos.size();
+ long count = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(productOrderDto.getQuantity()) >= 0).count();
+ long count2 = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) == 0).count();
+ productionProgressDto.setTotalOrderCount(totalCount);
+ productionProgressDto.setCompletedOrderCount(count);
+ productionProgressDto.setUncompletedOrderCount(count2);
+ productionProgressDto.setPartialCompletedOrderCount(totalCount-count-count2);
+ return productionProgressDto;
+ }
+ @Override
+ public ProductionTurnoverDto workInProcessTurnover() {
+ ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();
+ ProductWorkOrderDto workOrder = new ProductWorkOrderDto();
+ workOrder.setPlanStartTime(LocalDate.now().minusMonths(1));
+ workOrder.setPlanEndTime(LocalDate.now());
+ List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();
+ long sum = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)
+ .map(ProductWorkOrder::getPlanQuantity)
+ .mapToLong(BigDecimal::longValue)
+ .sum();
+ if (sum == 0)return null;
+ productionTurnoverDto.setTotalOrderCount(sum);//鎬诲湪鍒跺搧鏁伴噺
+ productionTurnoverDto.setAverageTurnoverDays(BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(ChronoUnit.DAYS.between(LocalDateTime.now().minusMonths(1), LocalDateTime.now())),2,RoundingMode.HALF_UP));
+ long completeQuantity = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) >= 0)
+ .map(ProductWorkOrder::getCompleteQuantity)
+ .mapToLong(BigDecimal::longValue)
+ .sum();
+ productionTurnoverDto.setTurnoverEfficiency(BigDecimal.valueOf(completeQuantity).divide(BigDecimal.valueOf(sum),2,RoundingMode.HALF_UP));
+ Map<String, List<ProductWorkOrderDto>> map = productWorkOrders.stream()
+ .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)
+ .collect(Collectors.groupingBy(ProductWorkOrderDto::getProcessName));
+ List<String> strings = new ArrayList<>();
+ List<Long> processQuantityDetails = new ArrayList<>();
+ map.entrySet().stream().forEach(entry -> {
+ String key = entry.getKey();
+ long completeSum = entry.getValue().stream().map(ProductWorkOrderDto::getCompleteQuantity).mapToLong(BigDecimal::longValue).sum();
+ strings.add(key);
+ processQuantityDetails.add(completeSum);
+ });
+ productionTurnoverDto.setProcessDetails(strings);
+ productionTurnoverDto.setProcessQuantityDetails(processQuantityDetails);
+ return productionTurnoverDto;
+ }
+
+ @Override
+ public DeptStaffDistributionDto deptStaffDistribution() {
+ DeptStaffDistributionDto dto = new DeptStaffDistributionDto();
+ List<MapDto> items = new ArrayList<>();
+
+ // 鏌ヨ鎵�鏈夋甯镐笖鏈垹闄ょ殑閮ㄩ棬
+ List<SysDept> depts = sysDeptMapper.selectDeptList(new SysDept());
+ if (CollectionUtils.isEmpty(depts)) {
+ dto.setItems(items);
+ return dto;
+ }
+
+ long totalUsers = 0;
+ List<Map<String, Object>> countsByDept = new ArrayList<>();
+
+ for (SysDept dept : depts) {
+ if ("0".equals(dept.getStatus()) && "0".equals(dept.getDelFlag())) {
+ Long count = sysUserDeptMapper.selectCount(new LambdaQueryWrapper<SysUserDept>()
+ .eq(SysUserDept::getDeptId, dept.getDeptId()));
+ if (count > 0) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("name", dept.getDeptName());
+ map.put("count", count);
+ countsByDept.add(map);
+ totalUsers += count;
+ }
+ }
+ }
+
+ if (totalUsers > 0) {
+ BigDecimal total = BigDecimal.valueOf(totalUsers);
+ for (Map<String, Object> map : countsByDept) {
+ MapDto mapDto = new MapDto();
+ mapDto.setName((String) map.get("name"));
+ Long count = (Long) map.get("count");
+ mapDto.setValue(count.toString());
+ mapDto.setRate(BigDecimal.valueOf(count).multiply(new BigDecimal("100"))
+ .divide(total, 2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ }
+
+ dto.setTotal(totalUsers);
+ dto.setItems(items);
+ return dto;
+ }
+
+ @Override
+ public HomeSummaryDto summaryStatistics() {
+ HomeSummaryDto dto = new HomeSummaryDto();
+ LocalDate now = LocalDate.now();
+ YearMonth currentMonth = YearMonth.from(now);
+ YearMonth prevMonth = currentMonth.minusMonths(1);
+
+ LocalDateTime currentMonthEnd = currentMonth.atEndOfMonth().atTime(23, 59, 59);
+ LocalDateTime prevMonthEnd = prevMonth.atEndOfMonth().atTime(23, 59, 59);
+
+ // 鎬诲伐浣滀汉鍛�
+ Long currentStaff = countStaff(currentMonthEnd);
+ Long prevStaff = countStaff(prevMonthEnd);
+ dto.setTotalStaff(currentStaff);
+ dto.setStaffGrowthRate(calculateMoM(currentStaff, prevStaff));
+
+ // 鎬诲鎴锋暟
+ Long currentCustomers = countCustomers(currentMonthEnd);
+ Long prevCustomers = countCustomers(prevMonthEnd);
+ dto.setTotalCustomer(currentCustomers);
+ dto.setCustomerGrowthRate(calculateMoM(currentCustomers, prevCustomers));
+
+ // 鎬讳緵搴斿晢鏁�
+ Long currentSuppliers = countSuppliers(currentMonthEnd);
+ Long prevSuppliers = countSuppliers(prevMonthEnd);
+ dto.setTotalSupplier(currentSuppliers);
+ dto.setSupplierGrowthRate(calculateMoM(currentSuppliers, prevSuppliers));
+
+ return dto;
+ }
+
+ private Long countStaff(LocalDateTime dateTime) {
+ Long sysUserCount = sysUserMapper.selectCount(new LambdaQueryWrapper<SysUser>()
+ .eq(SysUser::getDelFlag, "0")
+ .le(SysUser::getCreateTime, dateTime));
+ Long staffCountItem = staffOnJobMapper.selectCount(new LambdaQueryWrapper<StaffOnJob>()
+ .le(StaffOnJob::getCreateTime, dateTime));
+ return sysUserCount + staffCountItem;
+ }
+
+
+ private Long countCustomers(LocalDateTime dateTime) {
+ return customerMapper.selectCount(new LambdaQueryWrapper<Customer>()
+ .le(Customer::getMaintenanceTime, dateTime.toLocalDate()));
+ }
+
+ private Long countSuppliers(LocalDateTime dateTime) {
+ return supplierManageMapper.selectCount(new LambdaQueryWrapper<SupplierManage>()
+ .le(SupplierManage::getCreateTime, dateTime));
+ }
+
+ private String calculateMoM(Number current, Number prev) {
+ BigDecimal curVal = new BigDecimal(current.toString());
+ BigDecimal prevVal = new BigDecimal(prev.toString());
+ if (prevVal.compareTo(BigDecimal.ZERO) == 0) {
+ return curVal.compareTo(BigDecimal.ZERO) > 0 ? "100.00" : "0.00";
+ }
+ return curVal.subtract(prevVal)
+ .divide(prevVal, 4, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_UP)
+ .toString();
+ }
+
+ @Override
+ public List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type) {
+ LocalDate today = LocalDate.now();
+ LocalDate startDate;
+ LocalDate endDate;
+ switch (type) {
+ case 0: // 鍛�
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1: // 鏈�
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2: // 瀛ｅ害
+ 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");
+
+ List<Map<String, Object>> maps = purchaseLedgerMapper.selectMaps(queryWrapper);
+ return maps.stream().map(map -> {
+ SupplierPurchaseRankingDto dto = new SupplierPurchaseRankingDto();
+ dto.setSupplierName(map.get("supplier_name") != null ? map.get("supplier_name").toString() : "");
+ Object amount = map.get("total_amount");
+ dto.setTotalAmount(amount != null ? new BigDecimal(amount.toString()) : BigDecimal.ZERO);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ @Override
+ public CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type) {
+ CustomerRevenueAnalysisDto dto = new CustomerRevenueAnalysisDto();
+ List<MapDto> items = new ArrayList<>();
+ LocalDate today = LocalDate.now();
+
+ LocalDate start;
+ LocalDate end;
+ boolean groupByMonth = false;
+
+ switch (type) {
+ case 0: // 鍛�
+ start = today.with(DayOfWeek.MONDAY);
+ end = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1: // 鏈�
+ start = today.with(TemporalAdjusters.firstDayOfMonth());
+ end = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2: // 瀛ｅ害
+ Month firstMonthOfQuarter = today.getMonth().firstMonthOfQuarter();
+ start = today.withMonth(firstMonthOfQuarter.getValue()).with(TemporalAdjusters.firstDayOfMonth());
+ end = today.withMonth(firstMonthOfQuarter.plus(2).getValue()).with(TemporalAdjusters.lastDayOfMonth());
+ groupByMonth = true;
+ break;
+ default:
+ dto.setItems(items);
+ return dto;
+ }
+
+ List<SalesLedger> list = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getCustomerId, customerId)
+ .ge(SalesLedger::getEntryDate, start)
+ .le(SalesLedger::getEntryDate, end));
+
+ if (groupByMonth) {
+ for (int i = 0; i < 3; i++) {
+ LocalDate m = start.plusMonths(i);
+ String monthName = m.getMonthValue() + "鏈�";
+ BigDecimal sum = list.stream()
+ .filter(l -> l.getEntryDate() != null)
+ .filter(l -> {
+ LocalDate ld = l.getEntryDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+ return ld.getMonth() == m.getMonth() && ld.getYear() == m.getYear();
+ })
+ .map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ MapDto mapDto = new MapDto();
+ mapDto.setName(monthName);
+ mapDto.setValue(sum.setScale(2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ } else {
+ long days = ChronoUnit.DAYS.between(start, end) + 1;
+ for (int i = 0; i < days; i++) {
+ LocalDate d = start.plusDays(i);
+ String dayName = d.getMonthValue() + "/" + d.getDayOfMonth();
+ BigDecimal sum = list.stream()
+ .filter(l -> l.getEntryDate() != null)
+ .filter(l -> l.getEntryDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().equals(d))
+ .map(SalesLedger::getContractAmount)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ MapDto mapDto = new MapDto();
+ mapDto.setName(dayName);
+ mapDto.setValue(sum.setScale(2, RoundingMode.HALF_UP).toString());
+ items.add(mapDto);
+ }
+ }
+
+ dto.setItems(items);
+ return dto;
+ }
+
+ @Override
+ public ProductCategoryDistributionDto productCategoryDistribution() {
+ ProductCategoryDistributionDto dto = new ProductCategoryDistributionDto();
+ List<ProductCategoryDistributionDto.MajorCategoryDto> majorItems = new ArrayList<>();
+
+ // 鎵�鏈夌殑浜у搧澶х被鍜屽皬绫�
+ List<Product> allProducts = productMapper.selectList(new LambdaQueryWrapper<Product>());
+ if (CollectionUtils.isEmpty(allProducts)) {
+ dto.setItems(majorItems);
+ return dto;
+ }
+
+ List<Product> majorCategories = allProducts.stream().filter(p -> p.getParentId() == null).collect(Collectors.toList());
+ List<Product> minorCategories = allProducts.stream().filter(p -> p.getParentId() != null).collect(Collectors.toList());
+
+ // 浠� sales_ledger_product 鎷垮埌姣忎釜浜у搧鐨勫瀷鍙峰簱瀛�
+ // 闇�鍖呭惈瑙勬牸鍨嬪彿浠ユ敮鎸佷笁绾у垎甯�
+ List<Map<String, Object>> quantityMaps = salesLedgerProductMapper.selectMaps(new QueryWrapper<SalesLedgerProduct>()
+ .select("product_id", "specification_model", "type", "SUM(quantity) as sum_qty")
+ .isNotNull("product_id")
+ .groupBy("product_id", "specification_model", "type"));
+
+ Map<Long, Map<String, Map<Integer, BigDecimal>>> modelStockGroups = new HashMap<>();
+ for (Map<String, Object> map : quantityMaps) {
+ Long productId = Long.parseLong(map.get("product_id").toString());
+ String model = map.get("specification_model") != null ? map.get("specification_model").toString() : "鏈煡鍨嬪彿";
+ Integer type = Integer.parseInt(map.get("type").toString());
+ BigDecimal sum = map.get("sum_qty") != null ? new BigDecimal(map.get("sum_qty").toString()) : BigDecimal.ZERO;
+
+ modelStockGroups.computeIfAbsent(productId, k -> new HashMap<>())
+ .computeIfAbsent(model, k -> new HashMap<>())
+ .put(type, sum);
+ }
+
+ // 搴撳瓨骞舵眹鎬�
+ Map<Long, List<MapDto>> productModelsMap = new HashMap<>();
+ Map<Long, BigDecimal> productTotalStockMap = new HashMap<>();
+
+ for (Long pid : modelStockGroups.keySet()) {
+ Map<String, Map<Integer, BigDecimal>> models = modelStockGroups.get(pid);
+ BigDecimal productStock = BigDecimal.ZERO;
+ List<MapDto> modelDtos = new ArrayList<>();
+
+ for (String modelName : models.keySet()) {
+ Map<Integer, BigDecimal> types = models.get(modelName);
+ BigDecimal procurement = types.getOrDefault(2, BigDecimal.ZERO);
+ BigDecimal sales = types.getOrDefault(1, BigDecimal.ZERO);
+ BigDecimal stock = procurement.subtract(sales);
+ if (stock.compareTo(BigDecimal.ZERO) < 0) stock = BigDecimal.ZERO;
+
+ MapDto modelDto = new MapDto();
+ modelDto.setName(modelName);
+ modelDto.setValue(stock.stripTrailingZeros().toPlainString());
+ modelDtos.add(modelDto);
+ productStock = productStock.add(stock);
+ }
+ productModelsMap.put(pid, modelDtos);
+ productTotalStockMap.put(pid, productStock);
+ }
+
+ BigDecimal totalInventory = productTotalStockMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鍨嬪彿鍗犳瘮
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ for (List<MapDto> dtos : productModelsMap.values()) {
+ for (MapDto m : dtos) {
+ BigDecimal val = new BigDecimal(m.getValue());
+ m.setRate(val.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ }
+ }
+ }
+
+ // 鍒嗗眰鏁版嵁
+ for (Product major : majorCategories) {
+ ProductCategoryDistributionDto.MajorCategoryDto majorDto = new ProductCategoryDistributionDto.MajorCategoryDto();
+ majorDto.setName(major.getProductName());
+
+ List<ProductCategoryDistributionDto.MinorCategoryDto> minorDtos = new ArrayList<>();
+ BigDecimal majorStock = BigDecimal.ZERO;
+
+ for (Product minor : minorCategories) {
+ if (major.getId().equals(minor.getParentId())) {
+ BigDecimal stock = productTotalStockMap.getOrDefault(minor.getId(), BigDecimal.ZERO);
+ ProductCategoryDistributionDto.MinorCategoryDto minorDto = new ProductCategoryDistributionDto.MinorCategoryDto();
+ minorDto.setName(minor.getProductName());
+ minorDto.setValue(stock.stripTrailingZeros().toPlainString());
+
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ minorDto.setRate(stock.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ } else {
+ minorDto.setRate("0.00");
+ }
+
+ minorDto.setChildren(productModelsMap.getOrDefault(minor.getId(), new ArrayList<>()));
+ minorDtos.add(minorDto);
+ majorStock = majorStock.add(stock);
+ }
+ }
+
+ majorDto.setValue(majorStock.stripTrailingZeros().toPlainString());
+
+ if (totalInventory.compareTo(BigDecimal.ZERO) > 0) {
+ majorDto.setRate(majorStock.multiply(new BigDecimal("100"))
+ .divide(totalInventory, 2, RoundingMode.HALF_UP).toString());
+ } else {
+ majorDto.setRate("0.00");
+ }
+ majorDto.setChildren(minorDtos);
+ majorItems.add(majorDto);
+ }
+
+ dto.setItems(majorItems);
+ return dto;
+ }
+
+ @Override
+ public List<CustomerContributionRankingDto> customerContributionRanking(Integer type) {
+ LocalDate today = LocalDate.now();
+ LocalDate startDate = null;
+ LocalDate endDate = null;
+ switch (type) {
+ case 0:
+ startDate = today.with(DayOfWeek.MONDAY);
+ endDate = today.with(DayOfWeek.SUNDAY);
+ break;
+ case 1:
+ startDate = today.with(TemporalAdjusters.firstDayOfMonth());
+ endDate = today.with(TemporalAdjusters.lastDayOfMonth());
+ break;
+ case 2:
+ 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;
+ }
+
+ QueryWrapper<SalesLedger> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("customer_name", "SUM(contract_amount) as total_amount")
+ .isNotNull("customer_name")
+ .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<>();
+ for (Map<String, Object> map : maps) {
+ CustomerContributionRankingDto rankingDto = new CustomerContributionRankingDto();
+ rankingDto.setCustomerName(map.get("customer_name").toString());
+ rankingDto.setTotalAmount(map.get("total_amount") != null ? new BigDecimal(map.get("total_amount").toString()) : BigDecimal.ZERO);
+ result.add(rankingDto);
+ }
+ return result;
+ }
}
--
Gitblit v1.9.3