2022年12月14 18:39

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -1881,6 +1881,7 @@ ORDER BY
         FROM
             (
                 SELECT
+                    BCD.cname AS corpName,
                     BGD.CODE AS code,
                     BGD.Typeno AS typeNo,
                     BGD.brand AS brand,
@@ -1903,6 +1904,7 @@ ORDER BY
                             id
                     ) BOI ON BOI.pid = BO.id
                 LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
+                LEFT JOIN basic_corps_desc BCD ON BCD.id = BO.corp_id
                 <where>
                     BO.tenant_id = #{statisticsVo.tenantId}
                     and BO.is_deleted = 0
@@ -1945,33 +1947,35 @@ ORDER BY
     </select>
     <select id="specificationsProfitExport" resultType="org.springblade.purchase.sales.excel.SpecificationsProfitExcel">
         SELECT
-        @rank := @rank + 1 AS rankNo,
-        temp.*
+            @rank := @rank + 1 AS rankNo,
+            temp.*
         FROM
         (
         SELECT
-        BGD.CODE AS code,
-        BGD.Typeno AS typeNo,
-        BGD.brand AS brand,
-        BGD.brand_item AS brandItem,
-        SUM( BOI.quantity ) AS quantity,
-        SUM( BOI.amount ) AS amount
+            BCD.cname AS corpName,
+            BGD.CODE AS code,
+            BGD.Typeno AS typeNo,
+            BGD.brand AS brand,
+            BGD.brand_item AS brandItem,
+            SUM( BOI.quantity ) AS quantity,
+            SUM( BOI.amount ) AS amount
         FROM
         business_order BO
         LEFT JOIN (
-        SELECT
-        id,
-        pid,
-        item_id,
-        IFNULL( SUM( actual_quantity ), 0 ) AS quantity,
-        IFNULL( SUM( actual_quantity * price ), 0 ) AS amount
-        FROM
-        business_order_items
-        WHERE is_deleted = 0
-        GROUP BY
-        id
+            SELECT
+                id,
+                pid,
+                item_id,
+                IFNULL( SUM( actual_quantity ), 0 ) AS quantity,
+                IFNULL( SUM( actual_quantity * price ), 0 ) AS amount
+            FROM
+                business_order_items
+            WHERE is_deleted = 0
+            GROUP BY
+            id
         ) BOI ON BOI.pid = BO.id
         LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
+        LEFT JOIN basic_corps_desc BCD ON BCD.id = BO.corp_id
         <where>
             BO.tenant_id = #{statisticsVo.tenantId}
             and BO.is_deleted = 0