From dfd8a253b4c06826728cca1cdab9b67de68c271f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 29 Jun 2020 16:02:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=98=E9=87=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_totality_grid_query_month.ktr      |  2 +-
 .../screen_ys_grid_rank_month_update_year.ktr | 70 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
index 504dd25..d7d88b6 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr
@@ -2837,7 +2837,7 @@ AND del_flag = '0'</sql>
     <fields>
       <field>
         <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
+        <variable_name>project_num_month</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
index c4b708d..0a05eb3 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_year.ktr
@@ -566,7 +566,7 @@ VALUES
     </GUI>
   </step>
   <step>
-    <name>网格治理排行表-年</name>
+    <name>网格排名表 2</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -581,21 +581,20 @@ VALUES
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>INSERT INTO ys_grid_gov_rank (
-	comm_id,
-	comm_name,
+    <sql>INSERT INTO ys_grid_rank (
 	cal_date,
-	grid_name,
+	name,
 	grid_id,
+	comm_id,
+	comm_name,
+	topic_num,
 	project_num,
-	project_finish_num,
-	finish_rate,
 	create_time,
 	update_time
 )
 VALUES
 	(
-		${commId}, '${commName}', DATE_FORMAT(CURDATE(), '%Y'), '${communityGrid}', ${gridId}, ${project_num_year}, ${finish_project_num_year}, IFNULL(${finish_project_num_year} / ${project_num_year}, 0), NOW(), null
+		DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num}, ${project_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -613,13 +612,13 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>464</xloc>
-      <yloc>448</yloc>
+      <xloc>608</xloc>
+      <yloc>256</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>网格注册信息表</name>
+    <name>网格治理排行表-年</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -634,21 +633,21 @@ VALUES
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>INSERT INTO ys_grid_reg (
+    <sql>INSERT INTO ys_grid_gov_rank (
 	comm_id,
 	comm_name,
 	cal_date,
-	name,
+	grid_name,
 	grid_id,
-	reg_user_num,
-	reg_party_num,
-	reg_group_num,
+	project_num,
+	project_finish_num,
+	finish_rate,
 	create_time,
 	update_time
 )
 VALUES
 	(
-		${commId}, '${commName}', DATE_FORMAT(NOW(),'%Y'), '${communityGrid}', ${gridId}, ${reg_user_num_year}, ${reg_party_num_year}, ${reg_group_num_year}, NOW(), null
+		${commId}, '${commName}', DATE_FORMAT(CURDATE(), '%Y'), '${communityGrid}', ${gridId}, ${project_num_year}, ${finish_project_num_year}, IFNULL(${finish_project_num_year} / ${project_num_year}, 0), NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -667,12 +666,12 @@ VALUES
     </remotesteps>
     <GUI>
       <xloc>464</xloc>
-      <yloc>352</yloc>
+      <yloc>448</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>网格排名表 2</name>
+    <name>网格治理排行表-月</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -687,20 +686,21 @@ VALUES
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>INSERT INTO ys_grid_rank (
-	cal_date,
-	name,
-	grid_id,
+    <sql>INSERT INTO ys_grid_gov_rank (
 	comm_id,
 	comm_name,
-	topic_num,
+	cal_date,
+	grid_name,
+	grid_id,
 	project_num,
+	project_finish_num,
+	finish_rate,
 	create_time,
 	update_time
 )
 VALUES
 	(
-		DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${commId}, '${commName}', ${topic_num}, ${project_num}, NOW(), null
+		${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${project_num_month}, ${finish_project_num}, IFNULL(${finish_project_num} / ${project_num}, 0), NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -719,12 +719,12 @@ VALUES
     </remotesteps>
     <GUI>
       <xloc>608</xloc>
-      <yloc>256</yloc>
+      <yloc>480</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>网格治理排行表-月</name>
+    <name>网格注册信息表</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -739,21 +739,21 @@ VALUES
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>INSERT INTO ys_grid_gov_rank (
+    <sql>INSERT INTO ys_grid_reg (
 	comm_id,
 	comm_name,
 	cal_date,
-	grid_name,
+	name,
 	grid_id,
-	project_num,
-	project_finish_num,
-	finish_rate,
+	reg_user_num,
+	reg_party_num,
+	reg_group_num,
 	create_time,
 	update_time
 )
 VALUES
 	(
-		${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${project_num}, ${finish_project_num}, IFNULL(${finish_project_num} / ${project_num}, 0), NOW(), null
+		${commId}, '${commName}', DATE_FORMAT(NOW(),'%Y'), '${communityGrid}', ${gridId}, ${reg_user_num_year}, ${reg_party_num_year}, ${reg_group_num_year}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -771,8 +771,8 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>608</xloc>
-      <yloc>480</yloc>
+      <xloc>464</xloc>
+      <yloc>352</yloc>
       <draw>Y</draw>
     </GUI>
   </step>