From 873e0a1c32da853ce6fdb71a81722008aa619c49 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 30 Dec 2021 10:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BE=AA=E7=8E=AF=E6=8B=86?=
 =?UTF-8?q?=E6=88=90=E4=B8=A4=E9=83=A8=E5=88=86=EF=BC=8C=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BE=AA=E7=8E=AF=E5=89=8D=E4=B8=80=E7=99=BE?=
 =?UTF-8?q?=EF=BC=8C=E7=AC=AC=E4=BA=8C=E9=83=A8=E5=88=86=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doc/kettle/screen-yushan/yushan_all.kjb   | 375 +++++++++++++++-
 .../doc/kettle/screen-yushan/yushan_day.kjb   | 319 +++++++++++++-
 .../doc/kettle/screen-yushan/yushan_month.kjb | 379 ++++++++++++++--
 .../doc/kettle/screen-yushan/yushan_year.kjb  | 411 +++++++++++++++---
 4 files changed, 1385 insertions(+), 99 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb
index 28bcd52..89ab47f 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb
@@ -348,7 +348,7 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>网格下标</name>
+      <name>网格下标100-END</name>
       <description/>
       <type>SET_VARIABLES</type>
       <attributes/>
@@ -358,7 +358,7 @@
       <fields>
         <field>
           <variable_name>gridIndex</variable_name>
-          <variable_value>0</variable_value>
+          <variable_value>100</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
       </fields>
@@ -485,6 +485,11 @@
       <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
 gridIndex = gridIndex + 1;
 parent_job.setVariable("gridIndex",gridIndex);
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
 true;
 
 </script>
@@ -936,7 +941,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>640</xloc>
-      <yloc>320</yloc>
+      <yloc>1184</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -955,7 +960,7 @@ true;
         </field>
         <field>
           <variable_name>months</variable_name>
-          <variable_value>3</variable_value>
+          <variable_value>20</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
         <field>
@@ -973,7 +978,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>368</xloc>
-      <yloc>320</yloc>
+      <yloc>1184</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -992,7 +997,7 @@ true;
         </field>
         <field>
           <variable_name>months</variable_name>
-          <variable_value>3</variable_value>
+          <variable_value>20</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
         <field>
@@ -1029,7 +1034,7 @@ true;
         </field>
         <field>
           <variable_name>months</variable_name>
-          <variable_value>3</variable_value>
+          <variable_value>20</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
         <field>
@@ -1066,7 +1071,7 @@ true;
         </field>
         <field>
           <variable_name>months</variable_name>
-          <variable_value>3</variable_value>
+          <variable_value>20</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
         <field>
@@ -1087,10 +1092,261 @@ true;
       <yloc>912</yloc>
       <attributes_kjc/>
     </entry>
+    <entry>
+      <name>网格下标0-99</name>
+      <description/>
+      <type>SET_VARIABLES</type>
+      <attributes/>
+      <replacevars>Y</replacevars>
+      <filename/>
+      <file_variable_type>CURRENT_JOB</file_variable_type>
+      <fields>
+        <field>
+          <variable_name>gridIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+      </fields>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>464</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格数 2</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/screen_totality_grid_query_grid_info.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>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>0) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>0</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>结束循环 4</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <start>N</start>
+      <dummy>Y</dummy>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>12</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>320</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>gridIndex) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>${gridIndex}</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标加一，处理下个网格 2</name>
+      <description/>
+      <type>EVAL</type>
+      <attributes/>
+      <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
+gridIndex = gridIndex + 1;
+parent_job.setVariable("gridIndex",gridIndex);
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
+true;
+
+</script>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>320</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格操作 2</name>
+      <description/>
+      <type>JOB</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <job_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/yushan_grid_all_day.kjb</filename>
+      <jobname/>
+      <directory/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Nothing</loglevel>
+      <slave_server_name/>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <expand_remote_job>N</expand_remote_job>
+      <create_parent_folder>N</create_parent_folder>
+      <pass_export>N</pass_export>
+      <run_configuration>Pentaho local</run_configuration>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <set_append_logfile>N</set_append_logfile>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>320</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>日期下标 2 2</name>
+      <description/>
+      <type>SET_VARIABLES</type>
+      <attributes/>
+      <replacevars>Y</replacevars>
+      <filename/>
+      <file_variable_type>CURRENT_JOB</file_variable_type>
+      <fields>
+        <field>
+          <variable_name>monthIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+        <field>
+          <variable_name>months</variable_name>
+          <variable_value>20</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+        <field>
+          <variable_name>dayIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+        <field>
+          <variable_name>days</variable_name>
+          <variable_value>30</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+      </fields>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>368</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>index&lt;100</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${gridIndex}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>100</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>smaller</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>960</xloc>
+      <yloc>240</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
-      <from>网格下标</from>
+      <from>网格下标100-END</from>
       <to>网格数</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
@@ -1316,7 +1572,7 @@ true;
     </hop>
     <hop>
       <from>日期下标 2</from>
-      <to>网格下标</to>
+      <to>网格下标100-END</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1359,6 +1615,105 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>清空表</from>
+      <to>日期下标 2 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>日期下标 2 2</from>
+      <to>网格下标0-99</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标0-99</from>
+      <to>网格数 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格数 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>gridIndex) 2</from>
+      <to>网格操作 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格操作 2</from>
+      <to>网格下标加一，处理下个网格 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标加一，处理下个网格 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>index&lt;100</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>if(numberOfGrid>gridIndex) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb
index b546675..84a9b28 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb
@@ -348,7 +348,7 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>网格下标</name>
+      <name>网格下标100-END</name>
       <description/>
       <type>SET_VARIABLES</type>
       <attributes/>
@@ -358,7 +358,7 @@
       <fields>
         <field>
           <variable_name>gridIndex</variable_name>
-          <variable_value>0</variable_value>
+          <variable_value>100</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
       </fields>
@@ -485,6 +485,12 @@
       <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
 gridIndex = gridIndex + 1;
 parent_job.setVariable("gridIndex",gridIndex);
+
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
 true;
 
 </script>
@@ -902,10 +908,225 @@ true;
       <yloc>880</yloc>
       <attributes_kjc/>
     </entry>
+    <entry>
+      <name>网格下标0-99</name>
+      <description/>
+      <type>SET_VARIABLES</type>
+      <attributes/>
+      <replacevars>Y</replacevars>
+      <filename/>
+      <file_variable_type>CURRENT_JOB</file_variable_type>
+      <fields>
+        <field>
+          <variable_name>gridIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+      </fields>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>464</xloc>
+      <yloc>48</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格数 2</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/screen_totality_grid_query_grid_info.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>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>48</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>0) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>0</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>48</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>结束循环 4</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <start>N</start>
+      <dummy>Y</dummy>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>12</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>176</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>gridIndex) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>${gridIndex}</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>48</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标加一，处理下个网格 2</name>
+      <description/>
+      <type>EVAL</type>
+      <attributes/>
+      <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
+gridIndex = gridIndex + 1;
+parent_job.setVariable("gridIndex",gridIndex);
+
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
+true;
+
+</script>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>176</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格操作 2</name>
+      <description/>
+      <type>JOB</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <job_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/yushan_grid_day.kjb</filename>
+      <jobname/>
+      <directory/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Nothing</loglevel>
+      <slave_server_name/>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <expand_remote_job>N</expand_remote_job>
+      <create_parent_folder>N</create_parent_folder>
+      <pass_export>N</pass_export>
+      <run_configuration>Pentaho local</run_configuration>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <set_append_logfile>N</set_append_logfile>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>176</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>index&lt;100</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${gridIndex}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>100</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>smaller</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>960</xloc>
+      <yloc>112</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
-      <from>网格下标</from>
+      <from>网格下标100-END</from>
       <to>网格数</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
@@ -960,7 +1181,7 @@ true;
     </hop>
     <hop>
       <from>清空表</from>
-      <to>网格下标</to>
+      <to>网格下标100-END</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1129,6 +1350,96 @@ true;
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>清空表</from>
+      <to>网格下标0-99</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标0-99</from>
+      <to>网格数 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格数 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>gridIndex) 2</from>
+      <to>网格操作 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格操作 2</from>
+      <to>网格下标加一，处理下个网格 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标加一，处理下个网格 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>index&lt;100</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>if(numberOfGrid>gridIndex) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
index 2642df0..db259b4 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
@@ -306,11 +306,11 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>80</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>网格下标</name>
+      <name>网格下标100-END</name>
       <description/>
       <type>SET_VARIABLES</type>
       <attributes/>
@@ -320,7 +320,7 @@
       <fields>
         <field>
           <variable_name>gridIndex</variable_name>
-          <variable_value>0</variable_value>
+          <variable_value>100</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
       </fields>
@@ -328,7 +328,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>448</xloc>
-      <yloc>208</yloc>
+      <yloc>304</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -366,7 +366,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>208</yloc>
+      <yloc>304</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -390,7 +390,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>208</yloc>
+      <yloc>304</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -412,7 +412,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>336</yloc>
+      <yloc>432</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -436,7 +436,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>208</yloc>
+      <yloc>304</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -447,6 +447,11 @@
       <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
 gridIndex = gridIndex + 1;
 parent_job.setVariable("gridIndex",gridIndex);
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
 true;
 
 </script>
@@ -454,7 +459,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>336</yloc>
+      <yloc>432</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -491,7 +496,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>336</yloc>
+      <yloc>432</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -513,7 +518,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>448</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -535,7 +540,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>448</xloc>
-      <yloc>720</yloc>
+      <yloc>816</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -573,7 +578,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -597,7 +602,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -621,7 +626,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -658,7 +663,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>592</yloc>
+      <yloc>688</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -676,7 +681,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>592</yloc>
+      <yloc>688</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -698,7 +703,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>592</yloc>
+      <yloc>688</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -736,7 +741,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>720</yloc>
+      <yloc>816</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -760,7 +765,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>720</yloc>
+      <yloc>816</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -784,7 +789,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>720</yloc>
+      <yloc>816</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -821,7 +826,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>1056</xloc>
-      <yloc>848</yloc>
+      <yloc>944</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -839,7 +844,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>832</xloc>
-      <yloc>848</yloc>
+      <yloc>944</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -861,7 +866,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>624</xloc>
-      <yloc>848</yloc>
+      <yloc>944</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -898,8 +903,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>448</xloc>
-      <yloc>128</yloc>
+      <xloc>432</xloc>
+      <yloc>1072</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -936,8 +941,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>640</xloc>
-      <yloc>128</yloc>
+      <xloc>624</xloc>
+      <yloc>1072</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -975,7 +980,7 @@ true;
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>272</xloc>
-      <yloc>464</yloc>
+      <yloc>560</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -1012,14 +1017,228 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>272</xloc>
-      <yloc>128</yloc>
+      <xloc>256</xloc>
+      <yloc>1072</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标0-99</name>
+      <description/>
+      <type>SET_VARIABLES</type>
+      <attributes/>
+      <replacevars>Y</replacevars>
+      <filename/>
+      <file_variable_type>CURRENT_JOB</file_variable_type>
+      <fields>
+        <field>
+          <variable_name>gridIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+      </fields>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>448</xloc>
+      <yloc>32</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格数 2</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/screen_totality_grid_query_grid_info.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>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>624</xloc>
+      <yloc>32</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>0) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>0</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>832</xloc>
+      <yloc>32</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>结束循环 4</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <start>N</start>
+      <dummy>Y</dummy>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>12</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>624</xloc>
+      <yloc>160</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>gridIndex) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>${gridIndex}</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1056</xloc>
+      <yloc>32</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标加一，处理下个网格 2</name>
+      <description/>
+      <type>EVAL</type>
+      <attributes/>
+      <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
+gridIndex = gridIndex + 1;
+parent_job.setVariable("gridIndex",gridIndex);
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
+true;
+
+</script>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>832</xloc>
+      <yloc>160</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格操作 2</name>
+      <description/>
+      <type>JOB</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <job_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/yushan_grid_month.kjb</filename>
+      <jobname/>
+      <directory/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Nothing</loglevel>
+      <slave_server_name/>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <expand_remote_job>N</expand_remote_job>
+      <create_parent_folder>N</create_parent_folder>
+      <pass_export>N</pass_export>
+      <run_configuration>Pentaho local</run_configuration>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <set_append_logfile>N</set_append_logfile>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1056</xloc>
+      <yloc>160</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>index&lt;100</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${gridIndex}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>100</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>smaller</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>944</xloc>
+      <yloc>96</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
     <hop>
-      <from>网格下标</from>
+      <from>网格下标100-END</from>
       <to>网格数</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
@@ -1218,7 +1437,7 @@ true;
     </hop>
     <hop>
       <from>Start</from>
-      <to>网格下标</to>
+      <to>网格下标100-END</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1270,13 +1489,103 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>Start</from>
+      <to>网格下标0-99</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标0-99</from>
+      <to>网格数 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格数 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>gridIndex) 2</from>
+      <to>网格操作 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格操作 2</from>
+      <to>网格下标加一，处理下个网格 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标加一，处理下个网格 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>index&lt;100</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>if(numberOfGrid>gridIndex) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
     <notepad>
       <note>本来作为按月执行的作业。
 后改为按天执行，只是文件名未变更。</note>
-      <xloc>62</xloc>
-      <yloc>408</yloc>
+      <xloc>48</xloc>
+      <yloc>448</yloc>
       <width>265</width>
       <heigth>50</heigth>
       <fontname>Microsoft YaHei UI</fontname>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb
index f6777d8..d720c77 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_year.kjb
@@ -305,12 +305,12 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>80</xloc>
-      <yloc>400</yloc>
+      <xloc>96</xloc>
+      <yloc>592</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>网格下标</name>
+      <name>网格下标100-END</name>
       <description/>
       <type>SET_VARIABLES</type>
       <attributes/>
@@ -320,15 +320,15 @@
       <fields>
         <field>
           <variable_name>gridIndex</variable_name>
-          <variable_value>0</variable_value>
+          <variable_value>100</variable_value>
           <variable_type>CURRENT_JOB</variable_type>
         </field>
       </fields>
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>448</xloc>
-      <yloc>144</yloc>
+      <xloc>464</xloc>
+      <yloc>336</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -365,8 +365,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>144</yloc>
+      <xloc>640</xloc>
+      <yloc>336</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -389,8 +389,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>144</yloc>
+      <xloc>848</xloc>
+      <yloc>336</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -411,8 +411,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>272</yloc>
+      <xloc>640</xloc>
+      <yloc>464</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -435,8 +435,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>144</yloc>
+      <xloc>1072</xloc>
+      <yloc>336</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -447,14 +447,20 @@
       <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
 gridIndex = gridIndex + 1;
 parent_job.setVariable("gridIndex",gridIndex);
+
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
 true;
 
 </script>
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>272</yloc>
+      <xloc>848</xloc>
+      <yloc>464</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -490,8 +496,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>272</yloc>
+      <xloc>1072</xloc>
+      <yloc>464</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -512,8 +518,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>448</xloc>
-      <yloc>400</yloc>
+      <xloc>464</xloc>
+      <yloc>592</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -534,8 +540,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>448</xloc>
-      <yloc>656</yloc>
+      <xloc>464</xloc>
+      <yloc>848</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -572,8 +578,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>400</yloc>
+      <xloc>640</xloc>
+      <yloc>592</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -596,8 +602,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>400</yloc>
+      <xloc>848</xloc>
+      <yloc>592</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -620,8 +626,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>400</yloc>
+      <xloc>1072</xloc>
+      <yloc>592</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -657,8 +663,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>528</yloc>
+      <xloc>1072</xloc>
+      <yloc>720</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -675,8 +681,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>528</yloc>
+      <xloc>848</xloc>
+      <yloc>720</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -697,8 +703,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>528</yloc>
+      <xloc>640</xloc>
+      <yloc>720</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -735,8 +741,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>656</yloc>
+      <xloc>640</xloc>
+      <yloc>848</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -759,8 +765,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>656</yloc>
+      <xloc>848</xloc>
+      <yloc>848</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -783,8 +789,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>656</yloc>
+      <xloc>1072</xloc>
+      <yloc>848</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -820,8 +826,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>1056</xloc>
-      <yloc>784</yloc>
+      <xloc>1072</xloc>
+      <yloc>976</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -838,8 +844,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>832</xloc>
-      <yloc>784</yloc>
+      <xloc>848</xloc>
+      <yloc>976</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -860,8 +866,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>624</xloc>
-      <yloc>784</yloc>
+      <xloc>640</xloc>
+      <yloc>976</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -898,14 +904,229 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>192</xloc>
-      <yloc>400</yloc>
+      <xloc>208</xloc>
+      <yloc>592</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标0-99</name>
+      <description/>
+      <type>SET_VARIABLES</type>
+      <attributes/>
+      <replacevars>Y</replacevars>
+      <filename/>
+      <file_variable_type>CURRENT_JOB</file_variable_type>
+      <fields>
+        <field>
+          <variable_name>gridIndex</variable_name>
+          <variable_value>0</variable_value>
+          <variable_type>CURRENT_JOB</variable_type>
+        </field>
+      </fields>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>464</xloc>
+      <yloc>64</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格数 2</name>
+      <description/>
+      <type>TRANS</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <trans_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/screen_totality_grid_query_grid_info.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>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>64</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>0) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>0</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>64</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>结束循环 4</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <start>N</start>
+      <dummy>Y</dummy>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <intervalSeconds>0</intervalSeconds>
+      <intervalMinutes>60</intervalMinutes>
+      <hour>12</hour>
+      <minutes>0</minutes>
+      <weekDay>1</weekDay>
+      <DayOfMonth>1</DayOfMonth>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>640</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>if(numberOfGrid>gridIndex) 2</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${numberOfGrid}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>${gridIndex}</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>greater</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>64</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格下标加一，处理下个网格 2</name>
+      <description/>
+      <type>EVAL</type>
+      <attributes/>
+      <script>var gridIndex = parseInt(parent_job.getVariable("gridIndex"));
+gridIndex = gridIndex + 1;
+parent_job.setVariable("gridIndex",gridIndex);
+
+var subject="网格循环标记";
+//实例化日志channel对象
+var log= new org.pentaho.di.core.logging.LogChannel(subject);
+//日志输出
+log.logMinimal("----------------------------------------------------------------:"+gridIndex);
+true;
+
+</script>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>848</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>网格操作 2</name>
+      <description/>
+      <type>JOB</type>
+      <attributes/>
+      <specification_method>filename</specification_method>
+      <job_object_id/>
+      <filename>${Internal.Entry.Current.Directory}/yushan_grid_year.kjb</filename>
+      <jobname/>
+      <directory/>
+      <arg_from_previous>N</arg_from_previous>
+      <params_from_previous>N</params_from_previous>
+      <exec_per_row>N</exec_per_row>
+      <set_logfile>N</set_logfile>
+      <logfile/>
+      <logext/>
+      <add_date>N</add_date>
+      <add_time>N</add_time>
+      <loglevel>Nothing</loglevel>
+      <slave_server_name/>
+      <wait_until_finished>Y</wait_until_finished>
+      <follow_abort_remote>N</follow_abort_remote>
+      <expand_remote_job>N</expand_remote_job>
+      <create_parent_folder>N</create_parent_folder>
+      <pass_export>N</pass_export>
+      <run_configuration>Pentaho local</run_configuration>
+      <parameters>
+        <pass_all_parameters>Y</pass_all_parameters>
+      </parameters>
+      <set_append_logfile>N</set_append_logfile>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>1072</xloc>
+      <yloc>192</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>index&lt;100</name>
+      <description/>
+      <type>SIMPLE_EVAL</type>
+      <attributes/>
+      <valuetype>variable</valuetype>
+      <fieldname/>
+      <variablename>${gridIndex}</variablename>
+      <fieldtype>number</fieldtype>
+      <mask/>
+      <comparevalue>100</comparevalue>
+      <minvalue/>
+      <maxvalue/>
+      <successcondition>equal</successcondition>
+      <successnumbercondition>smaller</successnumbercondition>
+      <successbooleancondition>false</successbooleancondition>
+      <successwhenvarset>N</successwhenvarset>
+      <parallel>N</parallel>
+      <draw>Y</draw>
+      <nr>0</nr>
+      <xloc>960</xloc>
+      <yloc>128</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
     <hop>
-      <from>网格下标</from>
+      <from>网格下标100-END</from>
       <to>网格数</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
@@ -1104,7 +1325,7 @@ true;
     </hop>
     <hop>
       <from>清空表</from>
-      <to>网格下标</to>
+      <to>网格下标100-END</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1129,6 +1350,96 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>网格下标0-99</from>
+      <to>网格数 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格数 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>gridIndex) 2</from>
+      <to>网格操作 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格操作 2</from>
+      <to>网格下标加一，处理下个网格 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>网格下标加一，处理下个网格 2</from>
+      <to>if(numberOfGrid>0) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>清空表</from>
+      <to>网格下标0-99</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>if(numberOfGrid>0) 2</from>
+      <to>index&lt;100</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>if(numberOfGrid>gridIndex) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>index&lt;100</from>
+      <to>结束循环 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>N</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>