gongchunyi
3 天以前 d0cd9b9d98f2aa7a67c56aecb85044f52dbc9cd8
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>
@@ -43,7 +50,7 @@
    <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
        SELECT
        sdd.dict_label typeName,
        sum(income_money) account
        ifnull(sum(income_money),0) account
        FROM account_income ai
        left join sys_dict_data sdd on ai.income_type = sdd.dict_value and  sdd.dict_type='income_types'
        where
@@ -58,7 +65,7 @@
    </select>
    <select id="report1" resultType="java.math.BigDecimal">
        SELECT
        sum(income_money) account
        ifnull(sum(income_money),0) account
        FROM account_income ai
        where
        income_type=#{dictValue}
@@ -69,4 +76,17 @@
            AND income_date &lt;= 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>