Changes between Version 7 and Version 8 of AdvancedAppDevelopment

Timestamp:

09/30/25 03:07:48 (12 months ago)

Author:

185022

Comment:

--

AdvancedAppDevelopment

@@ -175 +175 @@
 select r.region_name as region,
        cat.ctg_name as category,
-       sum(asales.unitsSold) as totalUnitsSold,
+       sum(asales.unitsSold)::bigint as totalUnitsSold,
        sum(asales.income) as totalIncome
 from ArticleSales asales
@@ -286 +286 @@
 create or replace function YearlyIncomeProfitAndExpensesByWarehouses()
 returns table(
-    warehouseId bigint,
+    warehouseId integer,
     warehouseCity varchar(128),
     warehouseRegion varchar(128),
@@ -300 +300 @@
        c.city_name as warehouseCity,
        r.region_name as warehouseRegion,
-       extract(year from o.ord_date) as "year",
-       sum(o.ord_sum) as totalIncome,
-       sum(ord_sum)-sum(au.unit_cost_price) as total_profit
+       extract(year from o.ord_date)::double precision as "year",
+       sum(o.ord_sum)::decimal(10,2) as totalIncome,
+       (sum(o.ord_sum)-sum(au.unit_cost_price))::decimal(10,2) as total_profit
 from warehouse w
          join city c on w.city_id = c.city_id
@@ -347 +347 @@
                         and o.ord_date >= p.price_eff_date
                       group by a.art_id, a.art_name, cat.ctg_name)
-select art_id,
-       art_name,
-       category,
-       totalUnitsSold,
-       totalIncome,
-       totalCost,
-       totalProfit
+select ProductSales.art_id,
+       ProductSales.art_name,
+       ProductSales.category,
+       ProductSales.totalUnitsSold,
+       ProductSales.totalIncome,
+       ProductSales.totalCost,
+       ProductSales.totalProfit
 from ProductSales
-order by totalProfit desc;
+order by ProductSales.totalProfit desc;
 end;
 $$;