liding
5 天以前 98d89a1d9484104005e6d8b43365d7f508dde985
feat:1.收入,支出管理倒序排序
2.开票台账查询优化
已修改3个文件
10 ■■■■ 文件已修改
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/AccountExpenseMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/account/AccountIncomeMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -531,7 +531,9 @@
        IPage<SalesLedgerProductDto> salesLedgerProductDtoIPage = salesLedgerProductMapper.listPage(page, salesLedgerProduct);
        salesLedgerProductDtoIPage.getRecords().forEach(item -> {
            // 判断状态
            if(item.getTaxInclusiveTotalPrice().compareTo(item.getInvoiceTotal()) == 0){
            BigDecimal taxInclusiveTotalPrice = item.getTaxInclusiveTotalPrice();
            BigDecimal invoiceTotal = item.getInvoiceTotal();
            if(taxInclusiveTotalPrice != null && invoiceTotal != null && taxInclusiveTotalPrice.compareTo(invoiceTotal) == 0){
                item.setStatusName("已完成付款");
            }else{
                item.setStatusName("未完成付款");
@@ -545,7 +547,9 @@
        IPage<SalesLedgerProductDto> salesLedgerProductDtoIPage = salesLedgerProductMapper.listPagePurchaseLedger(page, salesLedgerProduct);
        salesLedgerProductDtoIPage.getRecords().forEach(item -> {
            // 判断状态
            if(item.getTaxInclusiveTotalPrice().compareTo(item.getTicketsTotal()) == 0){
            BigDecimal taxInclusiveTotalPrice = item.getTaxInclusiveTotalPrice();
            BigDecimal ticketsTotal = item.getTicketsTotal();
            if(taxInclusiveTotalPrice != null && ticketsTotal != null && taxInclusiveTotalPrice.compareTo(ticketsTotal) == 0){
                item.setStatusName("已完成付款");
            }else{
                item.setStatusName("未完成付款");
src/main/resources/mapper/account/AccountExpenseMapper.xml
@@ -19,6 +19,7 @@
        <if test="accountExpense.expenseMethod != null and accountExpense.expenseMethod != '' ">
            AND expense_method = #{accountExpense.expenseMethod}
        </if>
        order by create_time desc
    </select>
    <select id="accountExpenseExport" resultType="com.ruoyi.account.pojo.AccountExpense">
        SELECT
src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -20,6 +20,7 @@
        <if test="accountIncome.incomeMethod != null and accountIncome.incomeMethod != '' ">
            AND income_method = #{accountIncome.incomeMethod}
        </if>
        order by create_time desc
    </select>
    <select id="accountIncomeExport" resultType="com.ruoyi.account.pojo.AccountIncome">
        SELECT