Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

2026-02-13 74edc58b0d751f788da1d7a7e3fb241f946c5072

 src/main/java/com/ruoyi/account/service/AccountExpenseService.java

@@ -6,7 +6,9 @@
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;

import javax.servlet.http.HttpServletResponse;
@@ -21,7 +23,11 @@

    AccountDto report(DateQueryDto dateQueryDto);

    List<AccountDto3> reportExpense();
    List<AccountDto3> reportExpense(ReportDateDto reportDateDto);

    Map<String,List<String>> analysis();

    AccountExpense getByInvoiceNumber(String purchaseContractNumber);

    List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
}