From 2253780a50fa53f1bc7d9f327a1edfed98f79fae Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 八月 2025 10:09:12 +0800
Subject: [PATCH] 财务管理模块--报表调整
---
src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
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 b43888c..0439103 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.dto.AccountDto2;
+import com.ruoyi.account.dto.AccountDto3;
import com.ruoyi.account.mapper.AccountFileMapper;
import com.ruoyi.account.mapper.AccountIncomeMapper;
import com.ruoyi.account.pojo.AccountFile;
@@ -11,12 +13,18 @@
import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.quality.pojo.QualityInspect;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
+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;
@AllArgsConstructor
@Service
@@ -38,4 +46,28 @@
ExcelUtil<AccountIncome> util = new ExcelUtil<AccountIncome>(AccountIncome.class);
util.exportExcel(response, accountIncomes, "鏀跺叆绠＄悊瀵煎嚭");
}
+
+ //璐㈠姟鎶ヨ〃骞存煡璇�
+ @Override
+ public AccountDto3 reportIncome() {
+ AccountDto3 accountDto3 = new AccountDto3();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ int currentYear = LocalDate.now().getYear(); // 鑾峰彇褰撳墠骞翠唤锛堝2025锛�
+ List<String> months = new ArrayList<>();
+ Map<String, List<AccountDto2>> map = new HashMap<>();
+ for (int i = 1; i <= 12; i++) {
+ months.add(i + "鏈�");
+ // 褰撴湀绗竴澶╋細骞翠唤涓哄綋鍓嶅勾锛屾湀浠戒负i锛屾棩鏈熶负1
+ LocalDate firstDay = LocalDate.of(currentYear, i, 1);
+ DateQueryDto dateQueryDto = new DateQueryDto();
+ dateQueryDto.setEntryDateStart(firstDay.format(formatter));
+ // 褰撴湀鏈�鍚庝竴澶╋細绗竴澶╃殑鏈堜唤鐨勬渶鍚庝竴澶�
+ dateQueryDto.setEntryDateEnd(firstDay.plusMonths(1).minusDays(1).format(formatter));
+ List<AccountDto2> report = accountIncomeMapper.report(dateQueryDto);
+ map.put(i + "鏈�",report);
+ }
+ accountDto3.setMonth(months);
+ accountDto3.setAccountType(map);
+ return accountDto3;
+ }
}
--
Gitblit v1.9.3