From 30538e6c9612ef5f06300109ec224d1e50e208af Mon Sep 17 00:00:00 2001
From: yangkunan <yangkunan98@aliyun.com>
Date: Mon, 4 Nov 2024 09:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=A2=84=E7=AE=97=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/sqldialects.xml               |  5 +++--
 FineReport/tianbao/财务预算填报.sql | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 73eea4e..db8744b 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -4,12 +4,13 @@
     <file url="file://$PROJECT_DIR$/BI/销售业绩/市场费用报销明细.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/BI/销售业绩/电商销售订单.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/BI/销售业绩/经销商出货.sql" dialect="PostgreSQL" />
+    <file url="file://$PROJECT_DIR$/FineReport/tianbao/产品档案填报.sql" dialect="PostgreSQL" />
+    <file url="file://$PROJECT_DIR$/FineReport/tianbao/基础指标填报表.sql" dialect="PostgreSQL" />
+    <file url="file://$PROJECT_DIR$/FineReport/tianbao/财务预算填报.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/FineReport/维度表/经销商维度表.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/FineReport/财务主题/报表/费用/1_1_1OA表单下钻.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/FineReport/财务主题/报表/费用/1_1财务凭证下钻.sql" dialect="PostgreSQL" />
     <file url="file://$PROJECT_DIR$/FineReport/销售主题/报表/销售业绩/销售业绩组合统计表.sql" dialect="PostgreSQL" />
-    <file url="file://$PROJECT_DIR$/tianbao/产品档案填报.sql" dialect="PostgreSQL" />
-    <file url="file://$PROJECT_DIR$/tianbao/基础指标填报表.sql" dialect="PostgreSQL" />
     <file url="PROJECT" dialect="PostgreSQL" />
   </component>
 </project>
\ No newline at end of file
diff --git a/FineReport/tianbao/财务预算填报.sql b/FineReport/tianbao/财务预算填报.sql
index 9126551..24be4e5 100644
--- a/FineReport/tianbao/财务预算填报.sql
+++ b/FineReport/tianbao/财务预算填报.sql
@@ -8,15 +8,16 @@
 
 DROP TABLE IF EXISTS sdi_oth.ods_finance_budget_fill;
 CREATE TABLE sdi_oth.ods_finance_budget_fill (
-     years              VARCHAR(50)
-    ,corp_code          VARCHAR(50)
+    ID SERIAL PRIMARY KEY
+    ,years              VARCHAR(50)
+    ,corp_code          VARCHAR(100)
     ,corp_name          VARCHAR(100)
-    ,fee_type           VARCHAR(50)
-    ,subject_code       VARCHAR(50)
-    ,subject_name       VARCHAR(50)
-    ,begin_amt          DECIMAL(16,4)
-    ,adj_amt            DECIMAL(16,4)
-    ,amt                DECIMAL(16,4)
+    ,fee_type           VARCHAR(100)
+    ,subject_code       VARCHAR(100)
+    ,subject_name       VARCHAR(100)
+    ,begin_amt          VARCHAR(50)
+    ,adj_amt            VARCHAR(50)
+    ,amt                VARCHAR(50)
     ,update_date        VARCHAR(50)
     ,update_by          VARCHAR(50)
 );
@@ -37,8 +38,11 @@ COMMENT ON COLUMN sdi_oth.ods_finance_budget_fill.amt IS '调整后预算金额'
 COMMENT ON COLUMN sdi_oth.ods_finance_budget_fill.update_date IS '更新时间';
 COMMENT ON COLUMN sdi_oth.ods_finance_budget_fill.update_by IS '更新人';
 
+TRUNCATE TABLE sdi_oth.ods_finance_budget_fill;
 
-SELECT * FROM sdi_oth.ods_finance_budget_fill;
+SELECT COUNT(1) FROM sdi_oth.ods_finance_budget_fill WHERE begin_amt is NOT NULL;
+
+SELECT * FROM sdi_oth.ods_finance_budget_fill WHERE begin_amt is NOT NULL;
 
 
 SELECT