From 5e4d10fadb38dbe2aa640a9de7961b81016a6e76 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 17 Jun 2020 10:07:49 +0800
Subject: [PATCH] =?UTF-8?q?kt=20=E6=89=93=E5=88=86=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_ys_commu_hot_topic_update.ktr      | 376 +++++++++---------
 .../screen_ys_commu_hot_topic_update_day.ktr  |   4 +-
 ...reen_ys_commu_hot_topic_update_day_all.ktr |   2 +-
 .../screen_ys_commu_hot_topic_update_year.ktr | 188 ++++-----
 .../doc/kettle/screen-yushan/yushan_all.kjb   | 242 +++++++++--
 .../screen-yushan/yushan_comm_day_all.kjb     | 136 ++-----
 .../screen-yushan/yushan_grid_all_day.kjb     |  62 +--
 .../screen-yushan/yushan_null_all_day.kjb     | 246 +-----------
 .../screen-yushan/yushan_street_all_day.kjb   | 136 ++-----
 9 files changed, 594 insertions(+), 798 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr
index 427366b..4611b37 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr
@@ -950,6 +950,94 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>写入议题项目分类表</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <schema>${db.mysql.target.schema.yushandb}</schema>
+    <table>ys_classify</table>
+    <commit>1000</commit>
+    <truncate>N</truncate>
+    <ignore_errors>N</ignore_errors>
+    <use_batch>Y</use_batch>
+    <specify_fields>N</specify_fields>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_field/>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_field/>
+    <tablename_in_table>Y</tablename_in_table>
+    <return_keys>N</return_keys>
+    <return_field/>
+    <fields>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>464</xloc>
+      <yloc>752</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>写入议题项目分类表-年</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <schema>${db.mysql.target.schema.yushandb}</schema>
+    <table>ys_classify</table>
+    <commit>1000</commit>
+    <truncate>N</truncate>
+    <ignore_errors>N</ignore_errors>
+    <use_batch>Y</use_batch>
+    <specify_fields>N</specify_fields>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_field/>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_field/>
+    <tablename_in_table>Y</tablename_in_table>
+    <return_keys>N</return_keys>
+    <return_field/>
+    <fields>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>944</xloc>
+      <yloc>752</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>字段选择</name>
     <type>SelectValues</type>
@@ -1256,6 +1344,104 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>字段选择 3 2 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <name>classfy_id</name>
+      </field>
+      <field>
+        <name>classfy_name</name>
+      </field>
+      <field>
+        <name>comm_id</name>
+      </field>
+      <field>
+        <name>comm_name</name>
+      </field>
+      <field>
+        <name>topic_num</name>
+      </field>
+      <field>
+        <name>project_num</name>
+      </field>
+      <field>
+        <name>cal_date</name>
+      </field>
+      <select_unspecified>N</select_unspecified>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>304</xloc>
+      <yloc>752</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>字段选择 3 2 2 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <name>classfy_id</name>
+      </field>
+      <field>
+        <name>classfy_name</name>
+      </field>
+      <field>
+        <name>comm_id</name>
+      </field>
+      <field>
+        <name>comm_name</name>
+      </field>
+      <field>
+        <name>topic_num</name>
+      </field>
+      <field>
+        <name>project_num</name>
+      </field>
+      <field>
+        <name>cal_date</name>
+      </field>
+      <select_unspecified>N</select_unspecified>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>784</xloc>
+      <yloc>752</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>更新新闻资讯</name>
     <type>TableOutput</type>
@@ -1867,7 +2053,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID
 WHERE
 	pp.DEL_FLAG = '0'
  	AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
- 	AND YEAR (es.CREATED_TIME) = YEAR (NOW())
+ 	AND YEAR (pp.CREATED_TIME) = YEAR (NOW())
 GROUP BY
 	pp.id;</sql>
     <limit>0</limit>
@@ -2370,7 +2556,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID
 WHERE
 	pp.DEL_FLAG = '0'
  	AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
- 	AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')
+ 	AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m')
 GROUP BY
 	pp.id;</sql>
     <limit>0</limit>
@@ -2394,99 +2580,6 @@ GROUP BY
       <draw>Y</draw>
     </GUI>
   </step>
-  <step>
-    <name>写入议题项目分类表</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>target_yushan</connection>
-    <schema>${db.mysql.target.schema.yushandb}</schema>
-    <table>ys_classify</table>
-    <commit>1000</commit>
-    <truncate>N</truncate>
-    <ignore_errors>N</ignore_errors>
-    <use_batch>Y</use_batch>
-    <specify_fields>N</specify_fields>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_field/>
-    <tablename_in_table>Y</tablename_in_table>
-    <return_keys>N</return_keys>
-    <return_field/>
-    <fields>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>464</xloc>
-      <yloc>752</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>字段选择 3 2 2</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <fields>
-      <field>
-        <name>classfy_id</name>
-      </field>
-      <field>
-        <name>classfy_name</name>
-      </field>
-      <field>
-        <name>comm_id</name>
-      </field>
-      <field>
-        <name>comm_name</name>
-      </field>
-      <field>
-        <name>topic_num</name>
-      </field>
-      <field>
-        <name>project_num</name>
-      </field>
-      <field>
-        <name>cal_date</name>
-      </field>
-      <select_unspecified>N</select_unspecified>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>304</xloc>
-      <yloc>752</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
   <step>
     <name>统计议题项目分类表</name>
     <type>TableInput</type>
@@ -2568,99 +2661,6 @@ GROUP BY
       <draw>Y</draw>
     </GUI>
   </step>
-  <step>
-    <name>写入议题项目分类表-年</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>target_yushan</connection>
-    <schema>${db.mysql.target.schema.yushandb}</schema>
-    <table>ys_classify</table>
-    <commit>1000</commit>
-    <truncate>N</truncate>
-    <ignore_errors>N</ignore_errors>
-    <use_batch>Y</use_batch>
-    <specify_fields>N</specify_fields>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_field/>
-    <tablename_in_table>Y</tablename_in_table>
-    <return_keys>N</return_keys>
-    <return_field/>
-    <fields>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>944</xloc>
-      <yloc>752</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>字段选择 3 2 2 2</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <fields>
-      <field>
-        <name>classfy_id</name>
-      </field>
-      <field>
-        <name>classfy_name</name>
-      </field>
-      <field>
-        <name>comm_id</name>
-      </field>
-      <field>
-        <name>comm_name</name>
-      </field>
-      <field>
-        <name>topic_num</name>
-      </field>
-      <field>
-        <name>project_num</name>
-      </field>
-      <field>
-        <name>cal_date</name>
-      </field>
-      <select_unspecified>N</select_unspecified>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>784</xloc>
-      <yloc>752</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
   <step>
     <name>统计议题项目分类表-年</name>
     <type>TableInput</type>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr
index b932b81..48eaf5f 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr
@@ -1228,7 +1228,7 @@ FROM
 	epdc_events
 WHERE
 	DEL_FLAG = '0'
-AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
+	AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
 AND find_in_set(${commId}, ALL_DEPT_IDS)
 ORDER BY
 	COMMENT_NUM DESC
@@ -1473,7 +1473,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID
 WHERE
 	pp.DEL_FLAG = '0'
  	AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
- 	AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ 	AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
 GROUP BY
 	pp.id;</sql>
     <limit>0</limit>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr
index ef6225e..310fd57 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr
@@ -1473,7 +1473,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID
 WHERE
 	pp.DEL_FLAG = '0'
  	AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
-AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
+AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
 GROUP BY
 	pp.id;</sql>
     <limit>0</limit>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr
index aec288b..df7c739 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr
@@ -910,6 +910,50 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>写入议题项目分类表-年</name>
+    <type>TableOutput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <schema>${db.mysql.target.schema.yushandb}</schema>
+    <table>ys_classify</table>
+    <commit>1000</commit>
+    <truncate>N</truncate>
+    <ignore_errors>N</ignore_errors>
+    <use_batch>Y</use_batch>
+    <specify_fields>N</specify_fields>
+    <partitioning_enabled>N</partitioning_enabled>
+    <partitioning_field/>
+    <partitioning_daily>N</partitioning_daily>
+    <partitioning_monthly>Y</partitioning_monthly>
+    <tablename_in_field>N</tablename_in_field>
+    <tablename_field/>
+    <tablename_in_table>Y</tablename_in_table>
+    <return_keys>N</return_keys>
+    <return_field/>
+    <fields>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>752</xloc>
+      <yloc>544</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>字段选择</name>
     <type>SelectValues</type>
@@ -1063,6 +1107,55 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>字段选择 3 2 2 2</name>
+    <type>SelectValues</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <name>classfy_id</name>
+      </field>
+      <field>
+        <name>classfy_name</name>
+      </field>
+      <field>
+        <name>comm_id</name>
+      </field>
+      <field>
+        <name>comm_name</name>
+      </field>
+      <field>
+        <name>topic_num</name>
+      </field>
+      <field>
+        <name>project_num</name>
+      </field>
+      <field>
+        <name>cal_date</name>
+      </field>
+      <select_unspecified>N</select_unspecified>
+    </fields>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>592</xloc>
+      <yloc>544</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>统计新闻资讯</name>
     <type>TableInput</type>
@@ -1382,7 +1475,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID
 WHERE
 	pp.DEL_FLAG = '0'
  	AND find_in_set(${commId}, pp.ALL_DEPT_IDS)
- 	AND es.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) 
+ 	AND pp.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) 
 	AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' )
 GROUP BY
 	pp.id;</sql>
@@ -1407,99 +1500,6 @@ GROUP BY
       <draw>Y</draw>
     </GUI>
   </step>
-  <step>
-    <name>写入议题项目分类表-年</name>
-    <type>TableOutput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>target_yushan</connection>
-    <schema>${db.mysql.target.schema.yushandb}</schema>
-    <table>ys_classify</table>
-    <commit>1000</commit>
-    <truncate>N</truncate>
-    <ignore_errors>N</ignore_errors>
-    <use_batch>Y</use_batch>
-    <specify_fields>N</specify_fields>
-    <partitioning_enabled>N</partitioning_enabled>
-    <partitioning_field/>
-    <partitioning_daily>N</partitioning_daily>
-    <partitioning_monthly>Y</partitioning_monthly>
-    <tablename_in_field>N</tablename_in_field>
-    <tablename_field/>
-    <tablename_in_table>Y</tablename_in_table>
-    <return_keys>N</return_keys>
-    <return_field/>
-    <fields>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>752</xloc>
-      <yloc>544</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>字段选择 3 2 2 2</name>
-    <type>SelectValues</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <fields>
-      <field>
-        <name>classfy_id</name>
-      </field>
-      <field>
-        <name>classfy_name</name>
-      </field>
-      <field>
-        <name>comm_id</name>
-      </field>
-      <field>
-        <name>comm_name</name>
-      </field>
-      <field>
-        <name>topic_num</name>
-      </field>
-      <field>
-        <name>project_num</name>
-      </field>
-      <field>
-        <name>cal_date</name>
-      </field>
-      <select_unspecified>N</select_unspecified>
-    </fields>
-    <attributes/>
-    <cluster_schema/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>592</xloc>
-      <yloc>544</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
   <step>
     <name>统计议题项目分类表-年</name>
     <type>TableInput</type>
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 ac5552b..28bcd52 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb
@@ -935,8 +935,156 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>464</xloc>
-      <yloc>272</yloc>
+      <xloc>640</xloc>
+      <yloc>320</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>日期下标</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>3</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>320</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>日期下标 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>3</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>432</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>日期下标 3</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>3</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>656</yloc>
+      <attributes_kjc/>
+    </entry>
+    <entry>
+      <name>日期下标 4</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>3</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>912</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
@@ -995,15 +1143,6 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
-    <hop>
-      <from>清空表</from>
-      <to>网格下标</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)</from>
       <to>网格操作</to>
@@ -1022,15 +1161,6 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>清空表</from>
-      <to>街道下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>街道下标</from>
       <to>街道数</to>
@@ -1094,15 +1224,6 @@ true;
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>清空表</from>
-      <to>社区下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>社区下标</from>
       <to>社区数</to>
@@ -1168,6 +1289,15 @@ true;
     </hop>
     <hop>
       <from>清空表</from>
+      <to>日期下标</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>日期下标</from>
       <to>公益互助</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
@@ -1175,6 +1305,60 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>清空表</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>网格下标</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>清空表</from>
+      <to>日期下标 3</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>清空表</from>
+      <to>日期下标 4</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>日期下标 3</from>
+      <to>街道下标</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
+    <hop>
+      <from>日期下标 4</from>
+      <to>社区下标</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>N</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb
index c518cd4..8be103b 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb
@@ -309,33 +309,6 @@
       <yloc>224</yloc>
       <attributes_kjc/>
     </entry>
-    <entry>
-      <name>天数下标</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <replacevars>Y</replacevars>
-      <filename/>
-      <file_variable_type>CURRENT_JOB</file_variable_type>
-      <fields>
-        <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>368</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>if(dayIndex&lt;days)</name>
       <description/>
@@ -356,8 +329,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>368</yloc>
+      <xloc>528</xloc>
+      <yloc>384</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -393,8 +366,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>496</yloc>
+      <xloc>752</xloc>
+      <yloc>512</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -411,8 +384,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>496</yloc>
+      <xloc>528</xloc>
+      <yloc>512</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -423,35 +396,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>368</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>月数下标</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>3</variable_value>
-          <variable_type>CURRENT_JOB</variable_type>
-        </field>
-      </fields>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>368</xloc>
-      <yloc>80</yloc>
+      <xloc>752</xloc>
+      <yloc>384</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -474,8 +420,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>80</yloc>
+      <xloc>528</xloc>
+      <yloc>96</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -511,8 +457,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>208</yloc>
+      <xloc>752</xloc>
+      <yloc>224</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -529,8 +475,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>208</yloc>
+      <xloc>528</xloc>
+      <yloc>224</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -541,21 +487,12 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>80</yloc>
+      <xloc>752</xloc>
+      <yloc>96</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
-    <hop>
-      <from>Start</from>
-      <to>天数下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>N</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
     <hop>
       <from>社区操作</from>
       <to>day下标加一，处理下个day</to>
@@ -574,15 +511,6 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>天数下标</from>
-      <to>if(dayIndex&lt;days)</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>if(dayIndex&lt;days)</from>
       <to>社区操作</to>
@@ -602,17 +530,17 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>Start</from>
-      <to>月数下标</to>
+      <from>if(monthIndex&lt;months) 2</from>
+      <to>社区操作 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
+      <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>月数下标</from>
-      <to>if(monthIndex&lt;months) 2</to>
+      <from>社区操作 2</from>
+      <to>month下标加一，处理下个month</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -620,8 +548,8 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>if(monthIndex&lt;months) 2</from>
-      <to>社区操作 2</to>
+      <from>month下标加一，处理下个month</from>
+      <to>if(monthIndex&lt;months) 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -629,31 +557,31 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>社区操作 2</from>
-      <to>month下标加一，处理下个month</to>
+      <from>if(monthIndex&lt;months) 2</from>
+      <to>成功 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
+      <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>month下标加一，处理下个month</from>
+      <from>Start</from>
       <to>if(monthIndex&lt;months) 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
+      <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>if(monthIndex&lt;months) 2</from>
-      <to>成功 2</to>
+      <from>Start</from>
+      <to>if(dayIndex&lt;days)</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
     </hop>
   </hops>
   <notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb
index c82ba7a..fef73bb 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb
@@ -309,33 +309,6 @@
       <yloc>224</yloc>
       <attributes_kjc/>
     </entry>
-    <entry>
-      <name>月数下标</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>3</variable_value>
-          <variable_type>CURRENT_JOB</variable_type>
-        </field>
-      </fields>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>368</xloc>
-      <yloc>80</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>if(monthIndex&lt;months) 2</name>
       <description/>
@@ -356,7 +329,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
+      <xloc>512</xloc>
       <yloc>80</yloc>
       <attributes_kjc/>
     </entry>
@@ -393,7 +366,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
+      <xloc>736</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -411,7 +384,7 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
+      <xloc>512</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -423,30 +396,12 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
+      <xloc>736</xloc>
       <yloc>80</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
-    <hop>
-      <from>Start</from>
-      <to>月数下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>月数下标</from>
-      <to>if(monthIndex&lt;months) 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(monthIndex&lt;months) 2</from>
       <to>网格操作 2</to>
@@ -483,6 +438,15 @@ true;
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>Start</from>
+      <to>if(monthIndex&lt;months) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb
index 6cd1694..c187ad2 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb
@@ -305,153 +305,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>96</xloc>
-      <yloc>224</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>天数下标</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <replacevars>Y</replacevars>
-      <filename/>
-      <file_variable_type>CURRENT_JOB</file_variable_type>
-      <fields>
-        <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>368</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>if(dayIndex&lt;days)</name>
-      <description/>
-      <type>SIMPLE_EVAL</type>
-      <attributes/>
-      <valuetype>variable</valuetype>
-      <fieldname/>
-      <variablename>${dayIndex}</variablename>
-      <fieldtype>number</fieldtype>
-      <mask/>
-      <comparevalue>${days}</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>752</xloc>
-      <yloc>368</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>日操作</name>
-      <description/>
-      <type>JOB</type>
-      <attributes/>
-      <specification_method>filename</specification_method>
-      <job_object_id/>
-      <filename>${Internal.Entry.Current.Directory}/yushan_street_day_all_street.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>976</xloc>
-      <yloc>496</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>day下标加一，处理下个day</name>
-      <description/>
-      <type>EVAL</type>
-      <attributes/>
-      <script>var dayIndex = parseInt(parent_job.getVariable("dayIndex"));
-dayIndex = dayIndex + 1;
-parent_job.setVariable("dayIndex",dayIndex);
-true;
-
-</script>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>496</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>成功</name>
-      <description/>
-      <type>SUCCESS</type>
-      <attributes/>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>368</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>月数下标</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>3</variable_value>
-          <variable_type>CURRENT_JOB</variable_type>
-        </field>
-      </fields>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>368</xloc>
-      <yloc>80</yloc>
+      <xloc>224</xloc>
+      <yloc>256</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -474,8 +329,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>80</yloc>
+      <xloc>592</xloc>
+      <yloc>256</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -511,8 +366,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>208</yloc>
+      <xloc>816</xloc>
+      <yloc>384</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -529,8 +384,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>208</yloc>
+      <xloc>592</xloc>
+      <yloc>384</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -541,84 +396,12 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>80</yloc>
+      <xloc>816</xloc>
+      <yloc>256</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
-    <hop>
-      <from>Start</from>
-      <to>天数下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>N</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>日操作</from>
-      <to>day下标加一，处理下个day</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>day下标加一，处理下个day</from>
-      <to>if(dayIndex&lt;days)</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>天数下标</from>
-      <to>if(dayIndex&lt;days)</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>if(dayIndex&lt;days)</from>
-      <to>日操作</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>if(dayIndex&lt;days)</from>
-      <to>成功</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
-    <hop>
-      <from>Start</from>
-      <to>月数下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
-    <hop>
-      <from>月数下标</from>
-      <to>if(monthIndex&lt;months) 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(monthIndex&lt;months) 2</from>
       <to>月操作</to>
@@ -655,6 +438,15 @@ true;
       <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
+    <hop>
+      <from>Start</from>
+      <to>if(monthIndex&lt;months) 2</to>
+      <from_nr>0</from_nr>
+      <to_nr>0</to_nr>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
   </hops>
   <notepads>
   </notepads>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb
index be364ae..6229e71 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb
@@ -309,33 +309,6 @@
       <yloc>224</yloc>
       <attributes_kjc/>
     </entry>
-    <entry>
-      <name>天数下标</name>
-      <description/>
-      <type>SET_VARIABLES</type>
-      <attributes/>
-      <replacevars>Y</replacevars>
-      <filename/>
-      <file_variable_type>CURRENT_JOB</file_variable_type>
-      <fields>
-        <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>368</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>if(dayIndex&lt;days)</name>
       <description/>
@@ -356,8 +329,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>368</yloc>
+      <xloc>464</xloc>
+      <yloc>400</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -393,8 +366,8 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>496</yloc>
+      <xloc>688</xloc>
+      <yloc>528</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -411,8 +384,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>496</yloc>
+      <xloc>464</xloc>
+      <yloc>528</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -423,35 +396,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>368</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>月数下标</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>3</variable_value>
-          <variable_type>CURRENT_JOB</variable_type>
-        </field>
-      </fields>
-      <parallel>N</parallel>
-      <draw>Y</draw>
-      <nr>0</nr>
-      <xloc>368</xloc>
-      <yloc>80</yloc>
+      <xloc>688</xloc>
+      <yloc>400</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -474,8 +420,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>80</yloc>
+      <xloc>464</xloc>
+      <yloc>112</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -511,8 +457,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>208</yloc>
+      <xloc>688</xloc>
+      <yloc>240</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -529,8 +475,8 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>752</xloc>
-      <yloc>208</yloc>
+      <xloc>464</xloc>
+      <yloc>240</yloc>
       <attributes_kjc/>
     </entry>
     <entry>
@@ -541,21 +487,12 @@ true;
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>976</xloc>
-      <yloc>80</yloc>
+      <xloc>688</xloc>
+      <yloc>112</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
-    <hop>
-      <from>Start</from>
-      <to>天数下标</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>N</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
-    </hop>
     <hop>
       <from>街道操作</from>
       <to>day下标加一，处理下个day</to>
@@ -574,15 +511,6 @@ true;
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>天数下标</from>
-      <to>if(dayIndex&lt;days)</to>
-      <from_nr>0</from_nr>
-      <to_nr>0</to_nr>
-      <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
-    </hop>
     <hop>
       <from>if(dayIndex&lt;days)</from>
       <to>街道操作</to>
@@ -602,17 +530,17 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>Start</from>
-      <to>月数下标</to>
+      <from>if(monthIndex&lt;months) 2</from>
+      <to>街道操作 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
+      <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>月数下标</from>
-      <to>if(monthIndex&lt;months) 2</to>
+      <from>街道操作 2</from>
+      <to>month下标加一，处理下个month</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -620,8 +548,8 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>if(monthIndex&lt;months) 2</from>
-      <to>街道操作 2</to>
+      <from>month下标加一，处理下个month</from>
+      <to>if(monthIndex&lt;months) 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -629,31 +557,31 @@ true;
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>街道操作 2</from>
-      <to>month下标加一，处理下个month</to>
+      <from>if(monthIndex&lt;months) 2</from>
+      <to>成功 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
-      <evaluation>Y</evaluation>
+      <evaluation>N</evaluation>
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>month下标加一，处理下个month</from>
+      <from>Start</from>
       <to>if(monthIndex&lt;months) 2</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>N</unconditional>
+      <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>if(monthIndex&lt;months) 2</from>
-      <to>成功 2</to>
+      <from>Start</from>
+      <to>if(dayIndex&lt;days)</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
-      <evaluation>N</evaluation>
-      <unconditional>N</unconditional>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
     </hop>
   </hops>
   <notepads>