From a0f1f5629bc1c6338d7d95aa01b31cfd671bd398 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 18:02:31 +0800
Subject: [PATCH] yys 财务报表优化
---
src/main/java/com/ruoyi/account/dto/ReportDateDto.java | 41 +++++++++++++
src/main/java/com/ruoyi/account/service/AccountExpenseService.java | 3
src/main/resources/mapper/account/AccountExpenseMapper.xml | 2
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 9 +-
src/main/resources/mapper/account/AccountIncomeMapper.xml | 4
src/main/java/com/ruoyi/account/service/AccountIncomeService.java | 3
src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java | 32 ++++++++--
src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java | 31 +++++++--
8 files changed, 100 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index a6d771f..23e2508 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
@@ -138,8 +139,8 @@
*/
@GetMapping("/report/income")
@ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
- public AjaxResult reportIncome() {
- return AjaxResult.success(accountIncomeService.reportIncome());
+ public AjaxResult reportIncome(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
}
/**
@@ -149,8 +150,8 @@
*/
@GetMapping("/report/expense")
@ApiOperation("璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
- public AjaxResult reportExpense() {
- return AjaxResult.success(accountExpenseService.reportExpense());
+ public AjaxResult reportExpense(ReportDateDto reportDateDto) {
+ return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
}
diff --git a/src/main/java/com/ruoyi/account/dto/ReportDateDto.java b/src/main/java/com/ruoyi/account/dto/ReportDateDto.java
new file mode 100644
index 0000000..ab3799a
--- /dev/null
+++ b/src/main/java/com/ruoyi/account/dto/ReportDateDto.java
@@ -0,0 +1,41 @@
+package com.ruoyi.account.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * @author :yys
+ * @date : 2026/1/16 16:57
+ */
+@Data
+public class ReportDateDto {
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateStart;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate entryDateEnd;
+
+ /**
+ * 寮�濮嬫湀浠�
+ */
+ private Integer startMonth;
+
+ /**
+ * 缁撴潫鏈堜唤
+ */
+ private Integer endMonth;
+
+}
diff --git a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
index 7c91b2a..ac3e0b2 100644
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
@@ -6,6 +6,7 @@
import com.ruoyi.account.dto.AccountDto;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;
@@ -22,7 +23,7 @@
AccountDto report(DateQueryDto dateQueryDto);
- List<AccountDto3> reportExpense();
+ List<AccountDto3> reportExpense(ReportDateDto reportDateDto);
Map<String,List<String>> analysis();
diff --git a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
index 037a0ea..1004f28 100644
--- a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.pojo.AccountIncome;
import javax.servlet.http.HttpServletResponse;
@@ -17,7 +18,7 @@
void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);
- List<AccountDto3> reportIncome();
+ List<AccountDto3> reportIncome(ReportDateDto reportDateDto);
AccountIncome getByInvoiceNumber(String purchaseContractNumber);
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 6017793..b7791a9 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.account.dto.AccountDto;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountExpense;
@@ -90,24 +91,38 @@
//璐㈠姟鎶ヨ〃骞存煡璇�
@Override
- public List<AccountDto3> reportExpense() {
+ public List<AccountDto3> reportExpense(ReportDateDto reportDateDto) {
List<AccountDto3> accountDto3s = new ArrayList<>();
//鍏堟煡璇㈡敹鍏ョ被鍨嬫湁鍝簺
List<SysDictData> incomeTypes = sysDictDataMapper.selectDictDataByType("expense_types");
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- int currentYear = LocalDate.now().getYear(); // 鑾峰彇褰撳墠骞翠唤锛堝2025锛�
+// int currentYear = LocalDate.now().getYear(); // 鑾峰彇褰撳墠骞翠唤锛堝2025锛�
for (SysDictData incomeType : incomeTypes) {
AccountDto3 accountDto3 = new AccountDto3();
accountDto3.setTypeName(incomeType.getDictLabel());//绫诲瀷
List<BigDecimal> account=new ArrayList<>();
- for (int i = 1; i <= 12; i++) {
- // 褰撴湀绗竴澶╋細骞翠唤涓哄綋鍓嶅勾锛屾湀浠戒负i锛屾棩鏈熶负1
- LocalDate firstDay = LocalDate.of(currentYear, i, 1);
+ LocalDate startDate = reportDateDto.getEntryDateStart();
+ LocalDate endDate = reportDateDto.getEntryDateEnd();
+
+ // 鍒濆鍖栧惊鐜彉閲忎负璧峰鏃ユ湡
+ LocalDate currentDate = startDate;
+
+ // 寰幆锛氬綋鍓嶆棩鏈熶笉瓒呰繃缁撴潫鏃ユ湡鏃剁户缁�
+ while (!currentDate.isAfter(endDate)) {
+ // 褰撴湀绗竴澶�
+ LocalDate firstDay = currentDate.withDayOfMonth(1);
DateQueryDto dateQueryDto = new DateQueryDto();
dateQueryDto.setEntryDateStart(firstDay.format(formatter));
- // 褰撴湀鏈�鍚庝竴澶╋細绗竴澶╃殑鏈堜唤鐨勬渶鍚庝竴澶�
- dateQueryDto.setEntryDateEnd(firstDay.plusMonths(1).minusDays(1).format(formatter));
- account.add(accountExpenseMapper.report1(dateQueryDto,incomeType.getDictValue()));
+
+ // 褰撴湀鏈�鍚庝竴澶�
+ LocalDate lastDay = firstDay.plusMonths(1).minusDays(1);
+ dateQueryDto.setEntryDateEnd(lastDay.format(formatter));
+
+ // 绱姞鏁版嵁
+ account.add(accountExpenseMapper.report1(dateQueryDto, incomeType.getDictValue()));
+
+ // 鏈堜唤鍔犱竴锛堣嚜鍔ㄥ鐞嗚法骞达紝姣斿12鏈堝姞1涓湀浼氬彉鎴愪笅涓�骞�1鏈堬級
+ currentDate = currentDate.plusMonths(1);
}
accountDto3.setAccount(account);//绫诲瀷
accountDto3s.add(accountDto3);
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
index 199e399..4a83ecb 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
@@ -7,9 +7,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
+import com.ruoyi.account.dto.ReportDateDto;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.service.AccountIncomeService;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.project.system.domain.SysDictData;
@@ -51,24 +53,38 @@
//璐㈠姟鎶ヨ〃骞存煡璇�
@Override
- public List<AccountDto3> reportIncome() {
+ public List<AccountDto3> reportIncome(ReportDateDto reportDateDto) {
List<AccountDto3> accountDto3s = new ArrayList<>();
//鍏堟煡璇㈡敹鍏ョ被鍨嬫湁鍝簺
List<SysDictData> incomeTypes = sysDictDataMapper.selectDictDataByType("income_types");
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- int currentYear = LocalDate.now().getYear(); // 鑾峰彇褰撳墠骞翠唤锛堝2025锛�
+// int currentYear = LocalDate.now().getYear(); // 鑾峰彇褰撳墠骞翠唤锛堝2025锛�
for (SysDictData incomeType : incomeTypes) {
AccountDto3 accountDto3 = new AccountDto3();
accountDto3.setTypeName(incomeType.getDictLabel());//绫诲瀷
List<BigDecimal> account=new ArrayList<>();
- for (int i = 1; i <= 12; i++) {
- // 褰撴湀绗竴澶╋細骞翠唤涓哄綋鍓嶅勾锛屾湀浠戒负i锛屾棩鏈熶负1
- LocalDate firstDay = LocalDate.of(currentYear, i, 1);
+ LocalDate startDate = reportDateDto.getEntryDateStart();
+ LocalDate endDate = reportDateDto.getEntryDateEnd();
+
+ // 鍒濆鍖栧惊鐜彉閲忎负璧峰鏃ユ湡
+ LocalDate currentDate = startDate;
+
+ // 寰幆锛氬綋鍓嶆棩鏈熶笉瓒呰繃缁撴潫鏃ユ湡鏃剁户缁�
+ while (!currentDate.isAfter(endDate)) {
+ // 褰撴湀绗竴澶�
+ LocalDate firstDay = currentDate.withDayOfMonth(1);
DateQueryDto dateQueryDto = new DateQueryDto();
dateQueryDto.setEntryDateStart(firstDay.format(formatter));
- // 褰撴湀鏈�鍚庝竴澶╋細绗竴澶╃殑鏈堜唤鐨勬渶鍚庝竴澶�
- dateQueryDto.setEntryDateEnd(firstDay.plusMonths(1).minusDays(1).format(formatter));
- account.add(accountIncomeMapper.report1(dateQueryDto,incomeType.getDictValue()));
+
+ // 褰撴湀鏈�鍚庝竴澶�
+ LocalDate lastDay = firstDay.plusMonths(1).minusDays(1);
+ dateQueryDto.setEntryDateEnd(lastDay.format(formatter));
+
+ // 绱姞鏁版嵁
+ account.add(accountIncomeMapper.report1(dateQueryDto, incomeType.getDictValue()));
+
+ // 鏈堜唤鍔犱竴锛堣嚜鍔ㄥ鐞嗚法骞达紝姣斿12鏈堝姞1涓湀浼氬彉鎴愪笅涓�骞�1鏈堬級
+ currentDate = currentDate.plusMonths(1);
}
accountDto3.setAccount(account);//绫诲瀷
accountDto3s.add(accountDto3);
diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
index fff6020..3b37674 100644
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ b/src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -58,7 +58,7 @@
<select id="report1" resultType="java.math.BigDecimal">
SELECT
- sum(expense_money) account
+ ifnull(sum(expense_money),0) account
FROM account_expense ai
where
expense_type=#{dictValue}
diff --git a/src/main/resources/mapper/account/AccountIncomeMapper.xml b/src/main/resources/mapper/account/AccountIncomeMapper.xml
index 1cb49b9..7400904 100644
--- a/src/main/resources/mapper/account/AccountIncomeMapper.xml
+++ b/src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -43,7 +43,7 @@
<select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
SELECT
sdd.dict_label typeName,
- sum(income_money) account
+ ifnull(sum(income_money),0) account
FROM account_income ai
left join sys_dict_data sdd on ai.income_type = sdd.dict_value and sdd.dict_type='income_types'
where
@@ -58,7 +58,7 @@
</select>
<select id="report1" resultType="java.math.BigDecimal">
SELECT
- sum(income_money) account
+ ifnull(sum(income_money),0) account
FROM account_income ai
where
income_type=#{dictValue}
--
Gitblit v1.9.3