Merge branch 'jtwy' into dev_New

zss

2026-01-19 d972907df11fa76d5766e9aed7f0d36488310d99

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

@@ -56,4 +56,18 @@
        group by 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 &gt;= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
            AND expense_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>

</mapper>