Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

2 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

 src/main/resources/mapper/account/AccountExpenseMapper.xml

@@ -10,6 +10,12 @@
        <if test="accountExpense.entryDateStart != null and accountExpense.entryDateStart != '' ">
            AND expense_date &gt;= 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 &lt;= DATE_FORMAT(#{accountExpense.entryDateEnd},'%Y-%m-%d')
        </if>
@@ -39,7 +45,7 @@
            AND expense_method = #{accountExpense.expenseMethod}
        </if>
    </select>
    <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
    <select id="report" resultType="com.ruoyi.account.bean.dto.AccountDto2">
        SELECT
        sdd.dict_label typeName,
        sum(expense_money) account
@@ -53,7 +59,7 @@
        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
            AND expense_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
        group by expense_type
        group by sdd.dict_label, ae.expense_type
    </select>

    <select id="report1" resultType="java.math.BigDecimal">