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

liyong

2 天以前 a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93

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

@@ -43,7 +43,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 +58,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 +69,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>