From d73f9c962b83ecd1c7f74cdeb1908bcfc3ec9fe0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 29 Jun 2020 17:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=98=E9=87=8F2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen-yushan/yushan_grid_month.kjb       | 45 +++++++------------
 1 file changed, 15 insertions(+), 30 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
index e09e29c..713cbb6 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month.kjb
@@ -462,36 +462,21 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>设置变量</name>
+      <name>JavaScript</name>
       <description/>
-      <type>TRANS</type>
+      <type>EVAL</type>
       <attributes/>
-      <specification_method>filename</specification_method>
-      <trans_object_id/>
-      <filename>${Internal.Entry.Current.Directory}/set_variable.ktr</filename>
-      <transname/>
-      <arg_from_previous>N</arg_from_previous>
-      <params_from_previous>N</params_from_previous>
-      <exec_per_row>N</exec_per_row>
-      <clear_rows>N</clear_rows>
-      <clear_files>N</clear_files>
-      <set_logfile>N</set_logfile>
-      <logfile/>
-      <logext/>
-      <add_date>N</add_date>
-      <add_time>N</add_time>
-      <loglevel>Basic</loglevel>
-      <cluster>N</cluster>
-      <slave_server_name/>
-      <set_append_logfile>N</set_append_logfile>
-      <wait_until_finished>Y</wait_until_finished>
-      <follow_abort_remote>N</follow_abort_remote>
-      <create_parent_folder>N</create_parent_folder>
-      <logging_remote_work>N</logging_remote_work>
-      <run_configuration>Pentaho local</run_configuration>
-      <parameters>
-        <pass_all_parameters>Y</pass_all_parameters>
-      </parameters>
+      <script>parent_job.setVariable("topic_num",0);
+parent_job.setVariable("project_num",0);
+parent_job.setVariable("reg_user_num",0);
+parent_job.setVariable("reg_party_num",0);
+parent_job.setVariable("reg_group_num",0);
+parent_job.setVariable("topic_num_year",0);
+parent_job.setVariable("project_num_year",0);
+parent_job.setVariable("reg_user_num_year",0);
+parent_job.setVariable("reg_party_num_year",0);
+parent_job.setVariable("reg_group_num_year",0);
+true;</script>
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
@@ -530,7 +515,7 @@
     </hop>
     <hop>
       <from>网格ID,NAME</from>
-      <to>设置变量</to>
+      <to>JavaScript</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -538,7 +523,7 @@
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>设置变量</from>
+      <from>JavaScript</from>
       <to>获取网格信息变量</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>