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

yaowanxin

19 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -162,7 +162,7 @@
        left join product p on pm.product_id = p.id
    </select>

    <select id="selectProductSalesAnalysis" resultType="java.util.LinkedHashMap">
    <select id="selectProductSalesAnalysis" resultType="java.util.Map">
        SELECT
            product_category as name,
            SUM( tax_inclusive_total_price ) AS value
@@ -177,7 +177,7 @@
        LIMIT 5
    </select>

    <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.LinkedHashMap">
    <select id="selectRawMaterialPurchaseAnalysis" resultType="java.util.Map">
        SELECT
            pr.product_name AS name,
            SUM( slp.tax_inclusive_total_price ) AS value
@@ -203,4 +203,21 @@
        AND register_date &lt;= #{endDate}
    </select>

    <select id="selectRawMaterialExpense" resultType="java.math.BigDecimal">
        WITH RECURSIVE product_tree AS (SELECT id
                                        FROM product
                                        WHERE product_name = '原材料'

                                        UNION ALL

                                        SELECT p.id
                                        FROM product p
                                                 INNER JOIN product_tree pt ON p.parent_id = pt.id)
        SELECT IFNULL(SUM(slp.tax_inclusive_total_price), 0)
        FROM sales_ledger_product slp
        WHERE slp.type = 2
          AND slp.product_id IN (SELECT id
                                 FROM product_tree);

    </select>
</mapper>