From 9347c9a4a91f9e0b6562fe72a25aa06a76a928e7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:25:33 +0800
Subject: [PATCH] refactor(account): 移除AccountExpense相关代码
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 31 ------
/dev/null | 101 --------------------
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 17 ---
src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml | 8 +
src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java | 4
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 20 ----
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 22 ----
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 1
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 53 +---------
9 files changed, 20 insertions(+), 237 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
deleted file mode 100644
index 9d49919..0000000
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.ruoyi.account.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.bean.dto.ReportDateDto;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.service.AccountExpenseService;
-import com.ruoyi.account.service.AccountIncomeService;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.dto.DateQueryDto;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import jakarta.annotation.Resource;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 璐㈠姟绠＄悊--鏀嚭绠＄悊
- */
-@RestController
-@RequestMapping("/account/accountExpense")
-@Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
-public class AccountExpenseController {
-
- @Resource
- private AccountExpenseService accountExpenseService;
-
- @Resource
- private AccountIncomeService accountIncomeService;
-
-
- /**
- * 鏂板
- * @param accountExpense
- * @return
- */
- @PostMapping("/add")
- @Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody AccountExpense accountExpense) {
- accountExpense.setInputTime(new Date());
- LoginUser loginUser = SecurityUtils.getLoginUser();
- accountExpense.setInputUser(loginUser.getNickName());
- return AjaxResult.success(accountExpenseService.save(accountExpense));
- }
-
- /**
- * 鍒犻櫎
- * @param ids
- * @return
- */
- @DeleteMapping("/del")
- @Operation(summary = "鍒犻櫎")
- public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- //鍒犻櫎妫�楠屽崟
- return AjaxResult.success(accountExpenseService.removeBatchByIds(ids));
- }
-
- /**
- * 淇敼
- * @param accountExpense
- * @return
- */
- @PostMapping("/update")
- @Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody AccountExpense accountExpense) {
- return AjaxResult.success(accountExpenseService.updateById(accountExpense));
- }
-
- /**
- *鍒嗛〉鏌ヨ
- * @param page
- * @param accountExpense
- * @return
- */
- @GetMapping("/listPage")
- @Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
- return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
- }
-
- /**
- * 璇︽儏
- * @param id
- * @return
- */
- @GetMapping("/{id}")
- @Operation(summary = "璇︽儏")
- public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(accountExpenseService.getById(id));
- }
-
- /**
- * 瀵煎嚭
- * @param response
- * @param accountExpense
- */
- @PostMapping("/export")
- @Operation(summary = "瀵煎嚭")
- public void accountExpenseExport(HttpServletResponse response,AccountExpense accountExpense) {
- accountExpenseService.accountExpenseExport(response, accountExpense);
- }
-
- /**
- * 璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ
- * @param dateQueryDto
- * @return
- */
- @GetMapping("/report/forms")
- @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
- public AjaxResult report(DateQueryDto dateQueryDto) {
- return AjaxResult.success(accountExpenseService.report(dateQueryDto));
- }
-
- /**
- * 璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽
- * @return
- */
- @GetMapping("/report/analysis")
- @Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
- public AjaxResult analysis() {
- return AjaxResult.success(accountExpenseService.analysis());
- }
-
- /**
- * 璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ
- * @param
- * @return
- */
- @GetMapping("/report/income")
- @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
- public AjaxResult reportIncome(ReportDateDto reportDateDto) {
- return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
- }
-
- /**
- * 璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ
- * @param
- * @return
- */
- @GetMapping("/report/expense")
- @Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
- public AjaxResult reportExpense(ReportDateDto reportDateDto) {
- return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
- }
-
-
-}
diff --git a/src/main/java/com/ruoyi/account/mapper/AccountExpenseMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountExpenseMapper.java
deleted file mode 100644
index 4876e7b..0000000
--- a/src/main/java/com/ruoyi/account/mapper/AccountExpenseMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.ruoyi.account.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.bean.dto.AccountDto;
-import com.ruoyi.account.bean.dto.AccountDto2;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.dto.DateQueryDto;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import com.ruoyi.home.dto.IncomeExpenseAnalysisDto;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AccountExpenseMapper extends BaseMapper<AccountExpense> {
- IPage<AccountExpense> accountExpenseListPage(Page page, @Param("accountExpense") AccountExpense accountExpense);
-
- List<AccountExpense> accountExpenseExport(@Param("accountExpense") AccountExpense accountExpense);
-
-
- List<AccountDto2> report(@Param("dateQueryDto") DateQueryDto dateQueryDto);
- BigDecimal report1(@Param("dateQueryDto") DateQueryDto dateQueryDto, @Param("dictValue") String dictValue);
-
- List<IncomeExpenseAnalysisDto> selectAccountExpenseStats(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("dateFormat") String dateFormat);
-
- List<com.ruoyi.dto.MapDto> selectExpenseComposition(@Param("startDate") String startDate, @Param("endDate") String endDate);
-}
diff --git a/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java
index 10b1247..f687c74 100644
--- a/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java
+++ b/src/main/java/com/ruoyi/account/mapper/purchase/AccountPurchasePaymentMapper.java
@@ -6,8 +6,11 @@
import com.ruoyi.account.bean.dto.purchase.AccountPurchasePaymentDto;
import com.ruoyi.account.bean.vo.purchase.AccountPurchasePaymentVo;
import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;
+import com.ruoyi.home.dto.IncomeExpenseAnalysisDto;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -22,4 +25,5 @@
IPage<AccountPurchasePaymentVo> listPageAccountPurchasePayment(Page page, @Param("req") AccountPurchasePaymentDto accountPurchasePaymentDto);
+ List<IncomeExpenseAnalysisDto> selectPayment(@Param("startStr") String startStr, @Param("endStr") String endStr, @Param("dateFormat") String dateFormat);
}
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
deleted file mode 100644
index dcb6b4b..0000000
--- a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.ruoyi.account.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.dto.DateQueryDto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import jakarta.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * 璐㈠姟绠＄悊--鏀嚭绠＄悊
- * account_expense
- */
-@TableName(value = "account_expense")
-@Data
-public class AccountExpense extends DateQueryDto implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 搴忓彿
- */
- @TableId(type = IdType.AUTO)
- private Long id;
-
- /**
- * 涓氬姟id
- */
- private Long businessId;
-
- /**
- * 涓氬姟绫诲瀷 1-浠樻 2-杩樻 3-钖祫鍙戞斁
- */
- private Integer businessType;
-
- /**
- * 鏀嚭鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鏀嚭鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private Date expenseDate;
-
- /**
- * 鏀嚭绫诲瀷(鍔炲叕鐢ㄥ搧锛屽憳宸ュ伐璧勶紝宸梾璐癸紝璁惧璐圭敤锛屾潵绁ㄤ粯娆撅紝鍏朵粬)
- */
- @Excel(name = "鏀嚭绫诲瀷",readConverterExp = "0=鍔炲叕鐢ㄥ搧,1=鍛樺伐宸ヨ祫,2=宸梾璐�,3=璁惧璐圭敤,4=鏉ョエ浠樻,5=鍏朵粬")
- @NotBlank(message = "鏀嚭绫诲瀷涓嶈兘涓虹┖!!")
- private String expenseType;
-
- /**
- * 渚涘簲鍟嗗悕绉�
- */
- @Excel(name = "渚涘簲鍟嗗悕绉�")
- private String supplierName;
-
- /**
- * 鏀嚭閲戦
- */
- @Excel(name = "鏀嚭閲戦")
- private BigDecimal expenseMoney;
-
- /**
- * 鏀嚭鎻忚堪
- */
- @Excel(name = "鏀嚭鎻忚堪")
- private String expenseDescribed;
-
- /**
- * 浠樻鏂瑰紡(鐜伴噾锛屾敮绁紝閾惰杞处锛屽叾浠�)
- */
- @Excel(name = "浠樻鏂瑰紡",readConverterExp = "0=鐜伴噾,1=鏀エ,2=閾惰杞处,3=鍏朵粬")
- private String expenseMethod;
-
- /**
- * 鍙戠エ鍙风爜
- */
- @Excel(name = "鍙戠エ鍙风爜")
- private String invoiceNumber;
-
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞")
- private String note;
-
- /**
- * 褰曞叆浜哄憳
- */
- @Excel(name = "褰曞叆浜哄憳")
- private String inputUser;
-
- /**
- * 褰曞叆鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "褰曞叆鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
- private Date inputTime;
-
-
- @Schema(description = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @Schema(description = "鍒涘缓鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @Schema(description = "淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @Schema(description = "淇敼鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @Schema(description = "绉熸埛ID")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
-
-
- @TableField(fill = FieldFill.INSERT)
- private Long deptId;
-}
diff --git a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java b/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
deleted file mode 100644
index b070485..0000000
--- a/src/main/java/com/ruoyi/account/service/AccountExpenseService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.ruoyi.account.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.account.bean.dto.AccountDto;
-import com.ruoyi.account.bean.dto.AccountDto2;
-import com.ruoyi.account.bean.dto.AccountDto3;
-import com.ruoyi.account.bean.dto.ReportDateDto;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.dto.DateQueryDto;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-public interface AccountExpenseService extends IService<AccountExpense> {
-
- IPage<AccountExpense> accountExpenseListPage(Page page, AccountExpense accountExpense);
-
- void accountExpenseExport(HttpServletResponse response, AccountExpense accountExpense);
-
- AccountDto report(DateQueryDto dateQueryDto);
-
- List<AccountDto3> reportExpense(ReportDateDto reportDateDto);
-
- Map<String,List<String>> analysis();
-
- AccountExpense getByInvoiceNumber(String purchaseContractNumber);
-
- List<AccountExpense> getByInvoiceNumberList(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
deleted file mode 100644
index 9d392a2..0000000
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package com.ruoyi.account.service.impl;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.bean.dto.AccountDto;
-import com.ruoyi.account.bean.dto.AccountDto2;
-import com.ruoyi.account.bean.dto.AccountDto3;
-import com.ruoyi.account.bean.dto.ReportDateDto;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.mapper.AccountIncomeMapper;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountExpenseService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.dto.DateQueryDto;
-import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.mapper.SysDictDataMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@AllArgsConstructor
-@Service
-public class AccountExpenseServiceImpl extends ServiceImpl<AccountExpenseMapper, AccountExpense> implements AccountExpenseService {
-
- private AccountExpenseMapper accountExpenseMapper;
-
- private AccountIncomeMapper accountIncomeMapper;
-
- private SysDictDataMapper sysDictDataMapper;
-
-
- //鍒嗛〉鏌ヨ
- @Override
- public IPage<AccountExpense> accountExpenseListPage(Page page, AccountExpense accountExpense) {
- return accountExpenseMapper.accountExpenseListPage(page,accountExpense);
- }
-
- //瀵煎嚭
- @Override
- public void accountExpenseExport(HttpServletResponse response, AccountExpense accountExpense) {
- List<AccountExpense> accountExpenses =accountExpenseMapper.accountExpenseExport(accountExpense);
- ExcelUtil<AccountExpense> util = new ExcelUtil<AccountExpense>(AccountExpense.class);
- util.exportExcel(response, accountExpenses, "鏀嚭绠＄悊瀵煎嚭");
- }
-
- //璐㈠姟鎶ヨ〃鍥捐〃
- @Override
- public AccountDto report(DateQueryDto dateQueryDto) {
- AccountDto accountDto = new AccountDto();
- //鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敹鍏�
- List<AccountDto2> accountIncomes =accountIncomeMapper.report(dateQueryDto);
-
- Long incomeNumber = accountIncomeMapper.selectCount(Wrappers.<AccountIncome>lambdaQuery()
- .between(AccountIncome::getIncomeDate, dateQueryDto.getEntryDateStart(), dateQueryDto.getEntryDateEnd()));
- 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));
- });
- accountDto.setIncomeType(accountIncomes);
- //鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敮鍑�
- List<AccountDto2> accountExpenses =accountExpenseMapper.report(dateQueryDto);
- accountDto.setExpenseType(accountExpenses);
- Long expenseNumber = accountExpenseMapper.selectCount(Wrappers.<AccountExpense>lambdaQuery()
- .between(AccountExpense::getExpenseDate, dateQueryDto.getEntryDateStart(), dateQueryDto.getEntryDateEnd()));
- 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));
- });
- accountDto.setExpenseType(accountExpenses);
- //鍑�鏀跺叆
- BigDecimal netRevenue = totalIncome.subtract(totalExpense);
- accountDto.setNetRevenue(netRevenue);
- return accountDto;
- }
-
- //璐㈠姟鎶ヨ〃骞存煡璇�
- @Override
- 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锛�
- for (SysDictData incomeType : incomeTypes) {
- AccountDto3 accountDto3 = new AccountDto3();
- accountDto3.setTypeName(incomeType.getDictLabel());//绫诲瀷
- List<BigDecimal> account=new ArrayList<>();
- 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));
-
- // 褰撴湀鏈�鍚庝竴澶�
- 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);
- }
- return accountDto3s;
- }
-
- @Override
- public Map<String, List<String>> analysis() {
- // 鑾峰彇鏈�杩戝洓涓湀锛堝綋鍓嶆湀 + 鍓�3涓湀锛夌殑鏃堕棿鑼冨洿
- LocalDate today = LocalDate.now();
- DateTimeFormatter monthFormatter = DateTimeFormatter.ofPattern("yyyy-MM"); // 骞存湀鏍煎紡鍖栧櫒
- Map<String, List<String>> result = new HashMap<>();
- List<String> months = new ArrayList<>(); // 瀛樺偍骞存湀锛堝 2025-12銆�2025-11锛�
- List<String> totalIncomeList = new ArrayList<>(); // 姣忔湀鎬绘敹鍏�
- List<String> totalExpenseList = new ArrayList<>(); // 姣忔湀鎬绘敮鍑�
- List<String> netIncomeList = new ArrayList<>(); // 姣忔湀鍑�鏀跺叆锛堟敹鍏�-鏀嚭锛�
-
- // 姝ラ1锛氳绠楄繎4涓湀鐨勫勾鏈堝垪琛紙褰撳墠鏈堛�佸墠1鏈堛�佸墠2鏈堛�佸墠3鏈堬級
- List<String> targetMonths = new ArrayList<>();
- for (int i = 0; i < 4; i++) {
- LocalDate currentMonth = today.minusMonths(i);
- String monthStr = currentMonth.format(monthFormatter);
- targetMonths.add(monthStr);
- }
- // 鍙嶈浆鍒楄〃锛岀‘淇濋『搴忎负銆屽墠3鏈� 鈫� 褰撳墠鏈堛�嶏紙鍙�夛紝鎸夐渶姹傝皟鏁撮『搴忥級
- Collections.reverse(targetMonths);
-
- // 姝ラ2锛氫竴娆℃�ф煡璇㈣繎4涓湀鎵�鏈夋敹鍏ユ暟鎹紝鎸夆�滃勾鏈堚�濆垎缁勬眹鎬�
- LocalDate fourMonthsAgo = today.minusMonths(3).withDayOfMonth(1); // 杩�4涓湀璧峰鏃ワ紙鍓�3鏈�1鍙凤級
- LocalDate currentMonthEnd = today.withDayOfMonth(today.lengthOfMonth()); // 褰撳墠鏈堢粨鏉熸棩
- ZoneId zoneId = ZoneId.of("Asia/Shanghai");
- // 鏌ヨ杩�4涓湀鎵�鏈夋敹鍏�
- List<AccountIncome> allIncomes = accountIncomeMapper.selectList(
- Wrappers.<AccountIncome>lambdaQuery()
- .ge(AccountIncome::getIncomeDate, fourMonthsAgo.toString()) // 澶т簬绛変簬璧峰鏃�
- .le(AccountIncome::getIncomeDate, currentMonthEnd.toString()) // 灏忎簬绛変簬缁撴潫鏃�
- );
-
- // 鏀跺叆鎸夆�滃勾鏈堚�濆垎缁勬眹鎬伙紙key锛氬勾鏈堝瓧绗︿覆锛寁alue锛氬綋鏈堟�绘敹鍏ワ級
- Map<String, BigDecimal> monthlyIncomeMap = allIncomes.stream()
- .filter(income -> income.getIncomeMoney() != null) // 杩囨护绌洪噾棰�
- .collect(Collectors.groupingBy(
- income -> {
- // 灏嗚緭鍏ユ椂闂达紙瀛楃涓诧級杞崲涓篖ocalDate锛屽啀鏍煎紡鍖栦负骞存湀
- LocalDate inputDate = income.getIncomeDate().toInstant().atZone(zoneId).toLocalDate();
- return inputDate.format(monthFormatter);
- },
- Collectors.reducing(BigDecimal.ZERO, AccountIncome::getIncomeMoney, BigDecimal::add)
- ));
-
- // 姝ラ3锛氫竴娆℃�ф煡璇㈣繎4涓湀鎵�鏈夋敮鍑烘暟鎹紝鎸夆�滃勾鏈堚�濆垎缁勬眹鎬�
- List<AccountExpense> allExpenses = accountExpenseMapper.selectList(
- Wrappers.<AccountExpense>lambdaQuery()
- .ge(AccountExpense::getExpenseDate, fourMonthsAgo.toString())
- .le(AccountExpense::getExpenseDate, currentMonthEnd.toString())
- );
-
- // 鏀嚭鎸夆�滃勾鏈堚�濆垎缁勬眹鎬�
- Map<String, BigDecimal> monthlyExpenseMap = allExpenses.stream()
- .filter(expense -> expense.getExpenseMoney() != null) // 杩囨护绌洪噾棰�
- .collect(Collectors.groupingBy(
- expense -> {
- LocalDate inputDate = expense.getExpenseDate().toInstant().atZone(zoneId).toLocalDate();
- return inputDate.format(monthFormatter);
- },
- Collectors.reducing(BigDecimal.ZERO, AccountExpense::getExpenseMoney, BigDecimal::add)
- ));
-
- // 姝ラ4锛氬惊鐜�4涓洰鏍囨湀浠斤紝濉厖缁熻鏁版嵁锛堟棤鏁版嵁鏃堕粯璁や负0锛�
- for (String month : targetMonths) {
- // 褰撴湀鎬绘敹鍏ワ紙鏃犳暟鎹垯涓�0锛�
- BigDecimal totalIncome = monthlyIncomeMap.getOrDefault(month, BigDecimal.ZERO);
- // 褰撴湀鎬绘敮鍑猴紙鏃犳暟鎹垯涓�0锛�
- BigDecimal totalExpense = monthlyExpenseMap.getOrDefault(month, BigDecimal.ZERO);
- // 褰撴湀鍑�鏀跺叆锛堟敹鍏� - 鏀嚭锛�
- BigDecimal netIncome = totalIncome.subtract(totalExpense);
-
- // 濉厖鍒楄〃
- months.add(month);
- totalIncomeList.add(totalIncome.toString());
- totalExpenseList.add(totalExpense.toString());
- netIncomeList.add(netIncome.toString());
- }
-
- // 缁勮缁撴灉
- result.put("days", months); // 骞存湀锛堝 ["2025-09", "2025-10", "2025-11", "2025-12"]锛�
- result.put("totalIncome", totalIncomeList); // 瀵瑰簲鏈堜唤鎬绘敹鍏�
- result.put("totalExpense", totalExpenseList); // 瀵瑰簲鏈堜唤鎬绘敮鍑�
- result.put("netIncome", netIncomeList); // 瀵瑰簲鏈堜唤鍑�鏀跺叆
-
- 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));
- }
-
-
-}
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
index 773799d..3a56560 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.mapper.BorrowInfoMapper;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.account.service.BorrowInfoService;
import com.ruoyi.common.utils.DateUtils;
@@ -34,7 +32,6 @@
private final BorrowInfoMapper borrowInfoMapper;
private final AccountIncomeService accountIncomeService;
- private final AccountExpenseService accountExpenseService;
@Override
public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
@@ -88,21 +85,6 @@
one.setIncomeMoney(borrowInfo.getBorrowAmount());
accountIncomeService.updateById(one);
}
- // 鏄惁涓鸿繕娆�
- if(borrowInfo.getStatus() != null && borrowInfo.getStatus() == 2){
- // 鏂板鏀嚭璁板綍
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessId(borrowInfo.getId());
- accountExpense.setBusinessType(2);
- accountExpense.setExpenseDate(DateUtils.toDate(borrowInfo.getRepayDate()));
- accountExpense.setExpenseType("5");
- accountExpense.setExpenseMoney(borrowInfo.getBorrowAmount());
- accountExpense.setExpenseDescribed("杩樻");
- accountExpense.setExpenseMethod("3");
- accountExpense.setInputTime(DateUtils.getNowDate());
- accountExpense.setInputUser(borrowInfo.getBorrowerName());
- accountExpenseService.save(accountExpense);
- }
return AjaxResult.success("淇敼鎴愬姛");
}
return AjaxResult.success("淇敼澶辫触");
@@ -116,10 +98,6 @@
accountIncomeService.remove(new LambdaQueryWrapper<AccountIncome>()
.in(AccountIncome::getBusinessId, ids)
.eq(AccountIncome::getBusinessType, 2));
- // 鍒犻櫎鏀嚭绠＄悊
- accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
- .in(AccountExpense::getBusinessId, ids)
- .eq(AccountExpense::getBusinessType, 2));
return AjaxResult.success("鍒犻櫎鎴愬姛");
}
return AjaxResult.success("鍒犻櫎澶辫触");
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index 549d333..8d95062 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -203,7 +203,6 @@
BORROW_INFO("borrow_info"),
SALES_REFUND_AMOUNT_ORDER("sales_refund_amount_order"),
SALES_RECEIPT_RETURN("sales_receipt_return"),
- ACCOUNT_EXPENSE("account_expense"),
FIN_VOUCHER("fin_voucher"),
ACCOUNT_FILE("account_file"),
ACCOUNT_INVOICE_APPLICATION("account_invoice_application"),
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 e01927c..4f4931a 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -3,9 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.mapper.AccountIncomeMapper;
-import com.ruoyi.account.pojo.AccountExpense;
+import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.basic.mapper.CustomerMapper;
@@ -111,8 +110,7 @@
private final ProductionOperationTaskMapper productionOperationTaskMapper;
- private final AccountExpenseMapper accountExpenseMapper;
-
+ private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;
private final AccountIncomeMapper accountIncomeMapper;
private final ProductionAccountMapper productionAccountMapper;
@@ -1165,12 +1163,8 @@
// 2. 鏌ヨ鏁版嵁
List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);
+ List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);
- // List<IncomeExpenseAnalysisDto> purchaseList =
- // purchaseLedgerMapper.selectPurchaseStats(startStr, endStr, dateFormat);
-
- List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr,
- dateFormat);
// 3. 杞� Map锛堣嚜鍔ㄥ悎骞讹級
Map<String, BigDecimal> incomeMap = incomeList.stream()
@@ -1179,11 +1173,7 @@
IncomeExpenseAnalysisDto::getAmount,
BigDecimal::add));
- // Map<String, BigDecimal> purchaseMap = purchaseList.stream()
- // .collect(Collectors.toMap(
- // IncomeExpenseAnalysisDto::getDateStr,
- // IncomeExpenseAnalysisDto::getAmount,
- // BigDecimal::add));
+
Map<String, BigDecimal> expenseMap = expenseList.stream()
.collect(Collectors.toMap(
@@ -1197,18 +1187,12 @@
for (String dateStr : xAxis) {
Map<String, Object> item = new HashMap<>();
item.put("date", dateStr);
-
// 鏀跺叆
BigDecimal income = incomeMap.getOrDefault(dateStr, BigDecimal.ZERO);
item.put("income", income.setScale(2, RoundingMode.HALF_UP));
-
- // 鏀嚭 = 閲囪喘 + 璐㈠姟鏀嚭
- // BigDecimal purchase = purchaseMap.getOrDefault(dateStr, BigDecimal.ZERO);
+ // 鏀嚭
BigDecimal expense = expenseMap.getOrDefault(dateStr, BigDecimal.ZERO);
- // BigDecimal totalExpense = purchase.add(expense);
- BigDecimal totalExpense = expense;
-
- item.put("expense", totalExpense.setScale(2, RoundingMode.HALF_UP));
+ item.put("expense", expense.setScale(2, RoundingMode.HALF_UP));
result.add(item);
}
@@ -1236,7 +1220,7 @@
String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);
- List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr, dateFormat);
+ List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);
Map<String, BigDecimal> incomeMap = incomeList.stream().collect(Collectors
.toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));
@@ -1272,11 +1256,6 @@
rawMaterialDto.setName("鍘熸潗鏂�");
rawMaterialDto.setValue(rawMaterialAmount != null ? rawMaterialAmount.toString() : "0");
result.add(rawMaterialDto);
-
- List<MapDto> expenseList = accountExpenseMapper.selectExpenseComposition(null, null);
- if (expenseList != null) {
- result.addAll(expenseList);
- }
}
BigDecimal total = BigDecimal.ZERO;
@@ -1398,26 +1377,10 @@
}
// 鍏朵粬璐圭敤
- LambdaQueryWrapper<AccountExpense> expenseWrapper = new LambdaQueryWrapper<>();
- expenseWrapper.ge(AccountExpense::getExpenseDate,
- java.sql.Date.valueOf(currentMonth.atDay(1)));
- expenseWrapper.le(AccountExpense::getExpenseDate,
- java.sql.Date.valueOf(currentMonth.atEndOfMonth()));
- List<AccountExpense> expenses = accountExpenseMapper.selectList(expenseWrapper);
-
- BigDecimal otherExpense = BigDecimal.ZERO;
- if (!CollectionUtils.isEmpty(expenses)) {
- for (AccountExpense e : expenses) {
- if (e.getExpenseMoney() != null) {
- otherExpense = otherExpense.add(e.getExpenseMoney());
- }
- }
- }
// 鏈堝害鎬绘敮鍑�
- // BigDecimal monthlyExpenditure = rawMaterialCost.add(otherExpense);
- BigDecimal monthlyExpenditure = otherExpense;
+ BigDecimal monthlyExpenditure = BigDecimal.ZERO;
dto.setMonthlyExpenditure(monthlyExpenditure);
// 宸蹭粯娆� 梅锛堝凡浠樻 + 寰呬粯娆撅級
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index b4701f6..5834e65 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -4,8 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.bean.dto.SalesRefundAmountOrderDto;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.service.SalesRefundAmountOrderService;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.OrderUtils;
@@ -31,7 +29,6 @@
import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
/**
@@ -49,7 +46,6 @@
private final SalesLedgerMapper salesLedgerMapper;
private final SalesRefundAmountOrderService salesRefundAmountOrderService;
private final StockUtils stockUtils;
- private final AccountExpenseMapper accountExpenseMapper;
@Override
public IPage<ReturnManagementDto> listPage(Page page, ReturnManagementDto returnManagement) {
@@ -127,19 +123,6 @@
salesRefundAmountOrder.setNotRefundedAmount(salesRefundAmountOrder.getRefundedAmount());
// 鍒嗘壒閫�娆�
// salesRefundAmountOrderService.addSalesRefundAmountOrderDto(salesRefundAmountOrder);
- // 鍜岃储鍔¤仈鍔紝鏂板鏀嚭
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessType(3);
- accountExpense.setExpenseMoney(byId.getRefundAmount());
- accountExpense.setBusinessId(byId.getId());
- accountExpense.setExpenseDate(new Date());
- accountExpense.setExpenseMethod("3");
- accountExpense.setExpenseType("5");
- accountExpense.setExpenseDescribed("閿�鍞��璐ч��娆�");
- accountExpense.setNote(byId.getReturnReason());
- accountExpense.setInputUser(SecurityUtils.getLoginUser().getNickName());
- accountExpense.setInputTime(new Date());
- accountExpenseMapper.insert(accountExpense);
return true;
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index d5875e3..8237aa1 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -6,8 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.basic.mapper.SupplierManageMapper;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.utils.DateUtils;
@@ -55,7 +53,6 @@
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final TicketRegistrationMapper ticketRegistrationMapper;
private final ProductRecordMapper productRecordMapper;
- private final AccountExpenseService accountExpenseService;
/**
* 鏌ヨ浠樻鐧昏
@@ -116,20 +113,6 @@
salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal()));
paymentRegistrationMapper.insert(paymentRegistration);
salesLedgerProductMapper.updateById(salesLedgerProduct);
- // 2. 澶勭悊璐︽埛鏀嚭
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setExpenseDate(purchaseLedger.getEntryDate());
- accountExpense.setExpenseType("4");
- accountExpense.setSupplierName(purchaseLedger.getSupplierName());
- accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
- accountExpense.setExpenseDescribed("浠樻鏀嚭");
-
- accountExpense.setExpenseMethod(paymentRegistration.getPaymentMethod());
- accountExpense.setBusinessId(paymentRegistration.getId());
- accountExpense.setBusinessType(1);
- accountExpense.setInputTime(new Date());
- accountExpense.setInputUser(userId.getNickName());
- accountExpenseService.save(accountExpense);
}
return 1;
@@ -153,16 +136,6 @@
throw new RuntimeException("浠樻閲戦瓒呭嚭寰呬粯娆鹃噾棰�");
}
paymentRegistration.setUpdateTime(DateUtils.getNowDate());
- // 鍚屾淇敼璐︽埛鏀嚭
- LambdaQueryWrapper<AccountExpense> accountExpenseLambdaQueryWrapper = new LambdaQueryWrapper<>();
- accountExpenseLambdaQueryWrapper.eq(AccountExpense::getBusinessId, paymentRegistration.getId())
- .eq(AccountExpense::getBusinessType, 1)
- .last("limit 1");
- AccountExpense accountExpense = accountExpenseService.getOne(accountExpenseLambdaQueryWrapper);
- if(null!=accountExpense){
- accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
- accountExpenseService.updateById(accountExpense);
- }
// 淇敼閲囪喘浜у搧浠樻閲戦
salesLedgerProduct.setTicketsTotal(salesLedgerProduct.getTicketsTotal().add(subtract));
salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getTicketsTotal()));
@@ -468,10 +441,6 @@
@Override
public int delPaymentRegistration(List<Long> ids) {
- LambdaQueryWrapper<AccountExpense> accountExpenseLambdaQueryWrapper = new LambdaQueryWrapper<>();
- accountExpenseLambdaQueryWrapper.in(AccountExpense::getBusinessId, ids)
- .eq(AccountExpense::getBusinessType, 1);
- accountExpenseService.remove(accountExpenseLambdaQueryWrapper);
// 淇敼閲囪喘浜у搧鐨勫凡浠樻閲戦,寰呬粯娆鹃噾棰�
List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectBatchIds(ids);
for (PaymentRegistration paymentRegistration : paymentRegistrations) {
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index a6d4500..aad785a 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
-import com.ruoyi.account.pojo.AccountExpense;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
@@ -23,7 +20,6 @@
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -45,7 +41,6 @@
private final SchemeApplicableStaffServiceImpl schemeApplicableStaffService;
private final SysUserDeptMapper sysUserDeptMapper;
private final StaffLeaveMapper staffLeaveMapper;
- private final AccountExpenseMapper accountExpenseMapper;
@Override
public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
@@ -99,21 +94,6 @@
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- }
- // 鍜岃储鍔¤仈鍔紝鏂板鏀嚭
- if(staffSalaryMain.getStatus().equals(5)){
- AccountExpense accountExpense = new AccountExpense();
- accountExpense.setBusinessType(3);
- accountExpense.setExpenseMoney(staffSalaryMain.getTotalSalary());
- accountExpense.setBusinessId(staffSalaryMain.getId());
- accountExpense.setExpenseDate(new Date());
- accountExpense.setExpenseMethod("2");
- accountExpense.setExpenseType("1");
- accountExpense.setExpenseDescribed(staffSalaryMain.getSalaryTitle());
- accountExpense.setNote(staffSalaryMain.getRemark());
- accountExpense.setInputUser(SecurityUtils.getLoginUser().getNickName());
- accountExpense.setInputTime(new Date());
- accountExpenseMapper.insert(accountExpense);
}
return AjaxResult.success("淇敼鎴愬姛");
}
diff --git a/src/main/resources/mapper/account/AccountExpenseMapper.xml b/src/main/resources/mapper/account/AccountExpenseMapper.xml
deleted file mode 100644
index 77eed00..0000000
--- a/src/main/resources/mapper/account/AccountExpenseMapper.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.account.mapper.AccountExpenseMapper">
- <select id="accountExpenseListPage" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test=" accountExpense.supplierName != null and accountExpense.supplierName != ''">
- AND supplier_name like CONCAT('%',#{accountExpense.supplierName},'%')
- </if>
- <if test=" accountExpense.invoiceNumber != null and accountExpense.invoiceNumber != ''">
- AND invoice_number like CONCAT('%',#{accountExpense.invoiceNumber},'%')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="accountExpenseExport" resultType="com.ruoyi.account.pojo.AccountExpense">
- SELECT
- *
- FROM account_expense
- where
- 1=1
- <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{accountExpense.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="accountExpense.entryDateEnd != null and accountExpense.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
- </if>
- <if test="accountExpense.expenseType != null and accountExpense.expenseType != '' ">
- AND expense_type = #{accountExpense.expenseType}
- </if>
- <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
- AND expense_method = #{accountExpense.expenseMethod}
- </if>
- </select>
- <select id="report" resultType="com.ruoyi.account.bean.dto.AccountDto2">
- SELECT
- sdd.dict_label typeName,
- sum(expense_money) account
- FROM account_expense ae
- left join sys_dict_data sdd on ae.expense_type = sdd.dict_value and sdd.dict_type='expense_types'
- where
- 1=1
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- group by sdd.dict_label, ae.expense_type
- </select>
-
- <select id="report1" resultType="java.math.BigDecimal">
- SELECT
- ifnull(sum(expense_money),0) account
- FROM account_expense ai
- where
- expense_type=#{dictValue}
- <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
- AND expense_date >= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
- </if>
- <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
- AND expense_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
- </if>
- </select>
-
- <select id="selectAccountExpenseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
- SELECT DATE_FORMAT(expense_date, #{dateFormat}) as dateStr, IFNULL(SUM(expense_money), 0) as amount
- FROM account_expense
- WHERE expense_date BETWEEN #{startDate} AND #{endDate}
- GROUP BY dateStr
- </select>
-
- <select id="selectExpenseComposition" resultType="com.ruoyi.dto.MapDto">
- SELECT sdd.dict_label as name, CAST(IFNULL(SUM(ae.expense_money), 0) AS CHAR) as value
- FROM account_expense ae
- LEFT JOIN sys_dict_data sdd ON ae.expense_type = sdd.dict_value AND sdd.dict_type = 'expense_types'
- <where>
- <if test="startDate != null and startDate != ''">
- AND ae.expense_date >= #{startDate}
- </if>
- <if test="endDate != null and endDate != ''">
- AND ae.expense_date <= #{endDate}
- </if>
- </where>
- GROUP BY ae.expense_type, sdd.dict_label
- </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
index 3256586..3571783 100644
--- a/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
+++ b/src/main/resources/mapper/account/purchase/AccountPurchasePaymentMapper.xml
@@ -43,5 +43,13 @@
</if>
</where>
</select>
+ <select id="selectPayment" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+ SELECT DATE_FORMAT(payment_date, #{dateFormat}) AS dateStr,
+ IFNULL(SUM(payment_amount), 0) AS amount
+ FROM account_purchase_payment
+ WHERE payment_date BETWEEN #{startDate} AND #{endDate}
+ GROUP BY dateStr
+ ORDER BY dateStr
+ </select>
</mapper>
--
Gitblit v1.9.3