Merge remote-tracking branch 'origin/pim_yys' into pim_ywx

yaowanxin

2025-08-11 1b5604f8a88000e2f51d4c989fd179989468ee67

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

@@ -56,4 +56,17 @@
        </if>
        group by income_type
    </select>
    <select id="report1" resultType="java.math.BigDecimal">
        SELECT
        sum(income_money) account
        FROM account_income ai
        where
        income_type=#{dictValue}
        <if test="dateQueryDto.entryDateStart != null and dateQueryDto.entryDateStart != '' ">
            AND income_date &gt;= DATE_FORMAT(#{dateQueryDto.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
            AND income_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>
</mapper>