feat:1.groupBy 2.appVersion添加

liding

2026-04-09 269ff4fbac22ae08107ee47ef500bd9574ccccce

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

@@ -11,6 +11,13 @@
        <if test="accountIncome.entryDateStart != null and accountIncome.entryDateStart != '' ">
            AND income_date &gt;= DATE_FORMAT(#{accountIncome.entryDateStart},'%Y-%m-%d')
        </if>
        <if test="accountIncome.customerName != null and accountIncome.customerName != '' ">
            AND customer_name like CONCAT('%',#{accountIncome.customerName},'%')
        </if>

        <if test="accountIncome.invoiceNumber != null and accountIncome.invoiceNumber != '' ">
            AND invoice_number like CONCAT('%',#{accountIncome.invoiceNumber},'%')
        </if>
        <if test="accountIncome.entryDateEnd != null and accountIncome.entryDateEnd != '' ">
            AND income_date &lt;= DATE_FORMAT(#{accountIncome.entryDateEnd},'%Y-%m-%d')
        </if>
@@ -54,7 +61,7 @@
        <if test="dateQueryDto.entryDateEnd != null and dateQueryDto.entryDateEnd != '' ">
            AND income_date &lt;= DATE_FORMAT(#{dateQueryDto.entryDateEnd},'%Y-%m-%d')
        </if>
        group by income_type
        GROUP BY sdd.dict_label, ai.income_type
    </select>
    <select id="report1" resultType="java.math.BigDecimal">
        SELECT
@@ -76,7 +83,7 @@
               IFNULL(SUM(income_money), 0)            AS amount
        FROM account_income
        WHERE income_date BETWEEN #{startDate} AND #{endDate}
          AND business_type = 1
#           AND business_type = 1
        GROUP BY dateStr
        ORDER BY dateStr