重复变量处理

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>

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>