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

yaowanxin

19 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

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

@@ -69,4 +69,17 @@
            AND income_date <= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
    </select>

    <select id="selectIncomeStats"
            resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
        SELECT DATE_FORMAT(income_date, #{dateFormat}) AS dateStr,
               IFNULL(SUM(income_money), 0)            AS amount
        FROM account_income
        WHERE income_date BETWEEN #{startDate} AND #{endDate}
          AND business_type = 1
        GROUP BY dateStr
        ORDER BY dateStr

    </select>

</mapper>