From 78cd4843127c3211c774c014526ae6ce9f888fa7 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期六, 11 十月 2025 11:28:29 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java | 54 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 33 insertions(+), 21 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 0439103..b4188e5 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountIncomeServiceImpl.java
@@ -1,24 +1,24 @@
package com.ruoyi.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
import com.ruoyi.account.pojo.AccountIncome;
-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 com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -31,6 +31,8 @@
public class AccountIncomeServiceImpl extends ServiceImpl<AccountIncomeMapper, AccountIncome> implements AccountIncomeService {
private AccountIncomeMapper accountIncomeMapper;
+
+ private SysDictDataMapper sysDictDataMapper;
//鍒嗛〉鏌ヨ
@@ -49,25 +51,35 @@
//璐㈠姟鎶ヨ〃骞存煡璇�
@Override
- public AccountDto3 reportIncome() {
- AccountDto3 accountDto3 = new AccountDto3();
+ public List<AccountDto3> reportIncome() {
+ 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锛�
- 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);
+ 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);
+ 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()));
+ }
+ accountDto3.setAccount(account);//绫诲瀷
+ accountDto3s.add(accountDto3);
}
- accountDto3.setMonth(months);
- accountDto3.setAccountType(map);
- return accountDto3;
+ return accountDto3s;
+ }
+
+ @Override
+ public AccountIncome getByInvoiceNumber(String purchaseContractNumber) {
+ AccountIncome accountIncome = accountIncomeMapper.selectOne(new LambdaQueryWrapper<AccountIncome>()
+ .eq(AccountIncome::getInvoiceNumber, purchaseContractNumber));
+ return accountIncome;
}
}
--
Gitblit v1.9.3