From 7a49fcc92e3915d27ada01dfca4da2824ea2677d Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 29 Jun 2020 16:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=8F=98=E9=87=8F=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_totality_grid_query.ktr             |  2 +-
 .../screen_totality_grid_update.ktr            | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
index 7d39531..0ba51a3 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr
@@ -3882,7 +3882,7 @@ AND u.dept_id = ${gridId};</sql>
     <fields>
       <field>
         <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
+        <variable_name>project_num_now</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr
index 46fb323..1bb2602 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr
@@ -552,7 +552,7 @@
 )
 VALUES
 	(
-		${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null
+		${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num_now}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -608,8 +608,8 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>656</xloc>
-      <yloc>368</yloc>
+      <xloc>928</xloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -646,8 +646,8 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>448</xloc>
-      <yloc>240</yloc>
+      <xloc>720</xloc>
+      <yloc>416</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -684,8 +684,8 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>448</xloc>
-      <yloc>496</yloc>
+      <xloc>928</xloc>
+      <yloc>416</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -722,8 +722,8 @@ VALUES
       </output>
     </remotesteps>
     <GUI>
-      <xloc>448</xloc>
-      <yloc>368</yloc>
+      <xloc>720</xloc>
+      <yloc>544</yloc>
       <draw>Y</draw>
     </GUI>
   </step>