@chenchaolong/plugin-trade-compliance-workbench 1.0.39 → 1.0.41

package/dist/lib/workbench.service.js

@@ -3188,7 +3188,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 qb.andWhere(`row.${key} <= :range_${key}_to`, { [`range_${key}_to`]: range.to });
         }
         filters.apply?.(qb);
-        const [items, total] = await qb.orderBy('row.createdAt', 'DESC').skip((page - 1) * pageSize).take(pageSize).getManyAndCount();
+        const [items, total] = await qb.orderBy('row.updatedAt', 'DESC').addOrderBy('row.id', 'DESC').skip((page - 1) * pageSize).take(pageSize).getManyAndCount();
         return { items, total, page, pageSize };
     }
     async pagedCatalogQuery(entity, batchEntity, scope, query, filters) {
@@ -3213,7 +3213,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (hasQueryValue(range.to))
                 qb.andWhere(`row.${key} <= :range_${key}_to`, { [`range_${key}_to`]: range.to });
         }
-        const [items, total] = await qb.orderBy('row.createdAt', 'DESC').skip((page - 1) * pageSize).take(pageSize).getManyAndCount();
+        const [items, total] = await qb.orderBy('row.updatedAt', 'DESC').addOrderBy('row.id', 'DESC').skip((page - 1) * pageSize).take(pageSize).getManyAndCount();
         const batchIds = [...new Set(items.map(item => item.batchId).filter((id) => Boolean(id)))];
         const batches = batchIds.length ? await this.dataSource.getRepository(batchEntity).find({ where: { ...activeScope(scope), id: In(batchIds) } }) : [];
         const fileNames = new Map(batches.map(batch => [batch.id, batch.sourceFileName]));
@@ -4053,7 +4053,7 @@ function analyticsAggregationStatement(scope, query, currentYear, purpose) {
         : query.mode === 'PURCHASE'
             ? 'SUM("amountCny") OVER () AS "metricAmountCny", SUM("paidCny") OVER () AS "metricPaidCny", SUM("unpaidCny") OVER () AS "metricUnpaidCny", SUM("refundedCny") OVER () AS "metricRefundedCny", SUM("unrefundedCny") OVER () AS "metricUnrefundedCny"'
             : 'SUM("amountCny") OVER () AS "metricAmountCny", SUM("receivedCny") OVER () AS "metricReceivedCny", SUM("unreceivedCny") OVER () AS "metricUnreceivedCny"';
-    const dashboardJson = analyticsDashboardJsonSql(query, tenant, organization);
+    const dashboardJson = analyticsDashboardJsonSql(query, tenant, organization, from, to);
     const start = (query.page - 1) * query.pageSize + 1;
     const end = start + query.pageSize - 1;
     return {
@@ -4061,7 +4061,7 @@ function analyticsAggregationStatement(scope, query, currentYear, purpose) {
         parameters
     };
 }
-function analyticsDashboardJsonSql(query, tenant, organization) {
+function analyticsDashboardJsonSql(query, tenant, organization, from, to) {
     const amount = 'COALESCE("metricAmountCny", 0)';
     const paid = query.mode === 'PURCHASE' && query.dimension !== 'PRODUCT' ? 'COALESCE("metricPaidCny", 0)' : '0';
     const unpaid = query.mode === 'PURCHASE' && query.dimension !== 'PRODUCT' ? 'COALESCE("metricUnpaidCny", 0)' : '0';
@@ -4077,6 +4077,39 @@ function analyticsDashboardJsonSql(query, tenant, organization) {
     const sanctionHitCount = `(SELECT COUNT(*) FROM plugin_trade_compliance_company_sanction_match match WHERE match."tenantId" = ${tenant} AND match."organizationId" = ${organization} AND match."deletedAt" IS NULL)`;
     const salesFileReviewCount = `(SELECT COUNT(*) FROM plugin_trade_compliance_generated_sales_file file WHERE file."tenantId" = ${tenant} AND file."organizationId" = ${organization} AND file."deletedAt" IS NULL AND file."lastEditedAt" IS NULL)`;
     const complianceTodoCount = `(${customerContractReviewCount} + ${purchaseContractReviewCount} + ${productRiskCount} + ${sanctionHitCount} + ${salesFileReviewCount})`;
+    const monthlyTrend = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(
+      'month', monthly.month_no,
+      'purchaseAmountCny', monthly."purchaseAmountCny",
+      'salesAmountCny', monthly."salesAmountCny",
+      'estimatedGrossProfitCny', GREATEST(monthly."salesAmountCny" - monthly."purchaseAmountCny", 0),
+      'receivedCny', monthly."receivedCny"
+    ) ORDER BY monthly.month_no), '[]'::jsonb)
+    FROM (
+      SELECT month_no,
+        COALESCE(purchase_month."purchaseAmountCny", 0) AS "purchaseAmountCny",
+        COALESCE(sales_month."salesAmountCny", 0) AS "salesAmountCny",
+        COALESCE(sales_month."receivedCny", 0) AS "receivedCny"
+      FROM generate_series(1, 12) AS month_no
+      LEFT JOIN (
+        SELECT EXTRACT(MONTH FROM purchase."orderDate")::int AS month_no, SUM(purchase."contractAmountCny") AS "purchaseAmountCny"
+        FROM plugin_trade_compliance_purchase_order purchase
+        WHERE purchase."tenantId" = ${tenant} AND purchase."organizationId" = ${organization} AND purchase."deletedAt" IS NULL AND purchase."orderDate" BETWEEN ${from} AND ${to}
+        GROUP BY EXTRACT(MONTH FROM purchase."orderDate")::int
+      ) purchase_month USING (month_no)
+      LEFT JOIN (
+        SELECT EXTRACT(MONTH FROM purchase."orderDate")::int AS month_no,
+          SUM(ROUND(ROUND(line."unitPriceTaxIncluded" * (1 + COALESCE(manual."pricingProfitRateOverride", customer."defaultPricingProfitRate")), 0) * line.quantity, 0)) AS "salesAmountCny",
+          SUM(COALESCE(manual."receivedAmountCny", 0)) AS "receivedCny"
+        FROM plugin_trade_compliance_customer_contract contract
+        INNER JOIN plugin_trade_compliance_customer customer ON customer.id = contract."customerId" AND customer."tenantId" = contract."tenantId" AND customer."organizationId" = contract."organizationId" AND customer."deletedAt" IS NULL
+        INNER JOIN plugin_trade_compliance_purchase_order purchase ON purchase."tenantId" = contract."tenantId" AND purchase."organizationId" = contract."organizationId" AND purchase."deletedAt" IS NULL AND contract."normalizedContractNo" = regexp_replace(purchase."normalizedContractNo", '(-[0-9]+)?C$', '') || 'X'
+        LEFT JOIN plugin_trade_compliance_derived_sales_manual manual ON manual."customerContractId" = contract.id AND manual."purchaseOrderId" = purchase.id AND manual."tenantId" = contract."tenantId" AND manual."organizationId" = contract."organizationId" AND manual."deletedAt" IS NULL
+        INNER JOIN plugin_trade_compliance_purchase_order_line line ON line."purchaseOrderId" = purchase.id AND line."tenantId" = purchase."tenantId" AND line."organizationId" = purchase."organizationId" AND line."deletedAt" IS NULL
+        WHERE contract."tenantId" = ${tenant} AND contract."organizationId" = ${organization} AND contract."deletedAt" IS NULL AND purchase."orderDate" BETWEEN ${from} AND ${to}
+          AND (manual."pricingProfitRateOverride" IS NOT NULL OR (customer."pricingProfitRateStatus" = 'CONFIGURED' AND customer."defaultPricingProfitRate" IS NOT NULL))
+        GROUP BY EXTRACT(MONTH FROM purchase."orderDate")::int
+      ) sales_month USING (month_no)
+    ) monthly)`;
     return `jsonb_build_object(
     'kpis', jsonb_build_object(
       'purchaseTotalCny', ${purchaseTotal}, 'salesTotalCny', ${salesTotal},
@@ -4087,7 +4120,7 @@ function analyticsDashboardJsonSql(query, tenant, organization) {
       'complianceTodoCount', ${complianceTodoCount},
       'riskExposureCny', (${unreceived} + ${unpaid})
     ),
-    'monthlyTrend', '[]'::jsonb,
+    'monthlyTrend', ${monthlyTrend},
     'todos', jsonb_build_array(
       jsonb_build_object('key', 'customer-contract-review', 'label', '客户合同待审核', 'count', ${customerContractReviewCount}, 'priority', 'high', 'description', 'AI 解析完成但未人工确认的客户合同'),
       jsonb_build_object('key', 'purchase-contract-review', 'label', '采购合同待审核', 'count', ${purchaseContractReviewCount}, 'priority', 'high', 'description', '上传完成但未审核入库的采购合同'),