From ae659b7fe99a8862082a4ba4bb24148a2a6727ca Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 08 十月 2026 16:57:40 +0800
Subject: [PATCH] feat(芯导): 仓储物流出库 / 人力资源(离职/在职/合同/薪资) / 环保门禁(门禁+智能巡检) 后端

---
 src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java |   78 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
index 37c2f7c..8aadf10 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -22,12 +22,10 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @AllArgsConstructor
 @Service
@@ -66,9 +64,10 @@
         accountDto.setIncomeNumber(incomeNumber);
         BigDecimal totalIncome = accountIncomes.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
         accountDto.setTotalIncome(totalIncome);
-        accountIncomes.stream().forEach(accountDto2 -> {
-            accountDto2.setProportion(accountDto2.getAccount().divide(totalIncome,2,BigDecimal.ROUND_HALF_UP));
-        });
+        accountIncomes.forEach(accountDto2 -> accountDto2.setProportion(
+                totalIncome.compareTo(BigDecimal.ZERO) == 0
+                        ? BigDecimal.ZERO
+                        : accountDto2.getAccount().divide(totalIncome, 2, BigDecimal.ROUND_HALF_UP)));
         accountDto.setIncomeType(accountIncomes);
         //鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敮鍑�
         List<AccountDto2> accountExpenses =accountExpenseMapper.report(dateQueryDto);
@@ -78,9 +77,10 @@
         accountDto.setExpenseNumber(expenseNumber);
         BigDecimal totalExpense = accountExpenses.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
         accountDto.setTotalExpense(totalExpense);
-        accountExpenses.stream().forEach(accountDto2 -> {
-            accountDto2.setProportion(accountDto2.getAccount().divide(totalExpense,2,BigDecimal.ROUND_HALF_UP));
-        });
+        accountExpenses.forEach(accountDto2 -> accountDto2.setProportion(
+                totalExpense.compareTo(BigDecimal.ZERO) == 0
+                        ? BigDecimal.ZERO
+                        : accountDto2.getAccount().divide(totalExpense, 2, BigDecimal.ROUND_HALF_UP)));
         accountDto.setExpenseType(accountExpenses);
         //鍑�鏀跺叆
         BigDecimal netRevenue = totalIncome.subtract(totalExpense);
@@ -115,5 +115,63 @@
         return accountDto3s;
     }
 
+    @Override
+    public Map<String, List<String>> analysis() {
+        // 鑾峰彇鏈懆鐨勬椂闂磋寖鍥�
+        LocalDate startOfWeek = LocalDate.now().with(DayOfWeek.MONDAY);
+        LocalDate endOfWeek = LocalDate.now().with(DayOfWeek.SUNDAY);
+        Map<String, List<String>> result = new HashMap<>();
+        List<String> days = new ArrayList<>();
+        List<String> totalIncomeList = new ArrayList<>();
+        List<String> totalExpenseList = new ArrayList<>();
+        List<String> netIncomeList = new ArrayList<>();
+        // 鏍规嵁鏃堕棿鑼冨洿寰幆鏌ヨ姣忎竴澶╃殑鎬绘敹鍏ワ紝鎬绘敮鍑�,鍑�鏀跺叆锛堟�绘敹鍏�-鎬绘敮鍑猴級
+        for (LocalDate date = startOfWeek; date.isBefore(endOfWeek) || date.isEqual(endOfWeek); date = date.plusDays(1)) {
+            BigDecimal totalIncome = accountIncomeMapper.selectList(Wrappers.<AccountIncome>lambdaQuery()
+                    .eq(AccountIncome::getInputTime, date.toString()))
+                    .stream()
+                    .map(AccountIncome::getIncomeMoney)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal totalExpense = accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
+                    .eq(AccountExpense::getInputTime, date.toString()))
+                    .stream()
+                    .map(AccountExpense::getExpenseMoney)
+                    .filter(Objects::nonNull)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal netIncome = totalIncome.subtract(totalExpense);
+            days.add(date.toString());
+            totalIncomeList.add(totalIncome.toString());
+            totalExpenseList.add(totalExpense.toString());
+            netIncomeList.add(netIncome.toString());
+        }
+        result.put("days", days);  //  澶�
+        result.put("totalIncome", totalIncomeList); // 鏀跺叆
+        result.put("totalExpense", totalExpenseList); // 鏀嚭
+        result.put("netIncome", netIncomeList); // 鍑�鏀跺叆
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> categoryReport(DateQueryDto dateQueryDto) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("share", accountExpenseMapper.reportByCategory(dateQueryDto));
+        result.put("trend", accountExpenseMapper.trendByCategory(dateQueryDto));
+        return result;
+    }
+
+    @Override
+    public AccountExpense getByInvoiceNumber(String purchaseContractNumber) {
+        return accountExpenseMapper.selectOne(Wrappers.<AccountExpense>lambdaQuery()
+                .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
+    }
+
+    @Override
+    public List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber) {
+        return accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
+                .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
+    }
+
 
 }

--
Gitblit v1.9.3