From 2880203b99b601fc134861dc3e7be12a50d93b15 Mon Sep 17 00:00:00 2001 From: sealday Date: Thu, 9 May 2024 01:32:17 +0800 Subject: [PATCH] feat: contract date range (#939) Co-authored-by: sealday Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/939 --- .../src/server/sqls/pdf_record_no_porduct_fees.sql | 3 +-- .../src/server/sqls/pdf_record_product_fee_item.sql | 3 +-- .../src/server/sqls/settlement_calc_fee_no_products.sql | 3 +-- .../src/server/sqls/settlement_calc_fee_products.sql | 3 +-- .../plugin-rental/src/server/sqls/settlement_calc_products.sql | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql index 26aed2ae4..95a9c6933 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql @@ -20,8 +20,7 @@ FROM contracts c JOIN records r ON r.id = :recordId JOIN contract_items ci ON c.id = ci.contract_id - AND ci.start_date <= r."date" - AND ci.end_date >= r."date" + AND ci.date_range @> r."date" JOIN contract_plans cp ON cp.id = ci.contract_plan_id JOIN contract_plan_fee_items cpfi ON cpfi.contract_plan_id = cp.id JOIN products p ON p.id = cpfi.new_fee_products_id diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql index 514118825..15640bd6e 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql @@ -20,8 +20,7 @@ FROM record_contract rc JOIN records r ON r.id = rc.record_id JOIN contract_items ci ON ci.contract_id = rc.contract_id - AND ci.start_date <= r."date" - AND ci.end_date >= r."date" + AND ci.date_range @> r."date" JOIN contract_plans cp ON cp.id = ci.contract_plan_id JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id JOIN view_products_search_rule_special vpsrs ON cpli.new_products_id = ANY (vpsrs.parents) diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql index 54e98bb80..a50855827 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql @@ -11,8 +11,7 @@ FROM -- 开始查产品费用规则 JOIN contracts c ON c.id = s.contract_id JOIN contract_items ci ON c.id = ci.contract_id - AND ci.start_date <= s.start_date - AND ci.end_date >= s.start_date + AND ci.date_range @> s.start_date JOIN contract_plans cp ON cp.id = ci.contract_plan_id JOIN contract_plan_fee_items cpfi ON cpfi.contract_plan_id = cp.id JOIN products p ON p.id = cpfi.new_fee_products_id diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql index 575410fad..c6bf9795f 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql @@ -23,8 +23,7 @@ FROM -- 开始查产品费用规则 JOIN contracts c ON c.id = s.contract_id JOIN contract_items ci ON c.id = ci.contract_id - AND ci.start_date <= s.start_date - AND ci.end_date >= s.start_date + AND ci.date_range @> s.start_date JOIN contract_plans cp ON cp.id = ci.contract_plan_id JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id JOIN contract_plan_fee_items cpfi ON cpfi.lease_item_id = cpli.id diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql index 95ef479ab..4d3f3d58b 100644 --- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql +++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql @@ -28,8 +28,7 @@ FROM -- 开始查租金规则 JOIN contracts c ON c.id = s.contract_id JOIN contract_items ci ON c.id = ci.contract_id - AND ci.start_date <= s.start_date - AND ci.end_date >= s.start_date + AND ci.date_range @> s.start_date JOIN contract_plans cp ON cp.id = ci.contract_plan_id JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id -- 租金规则查询完毕