From 87e786fd6621b4af2d1fb37009a87f5601972ce8 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 29 Jun 2020 15:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E4=BB=BD=E6=94=B9=E4=B8=BA=E6=97=A5?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E6=95=B0=E6=8D=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen_totality_street_delete_month.ktr   |  88 +++++++-
 .../screen-yushan/yushan_comm_month.kjb       |   8 +-
 .../doc/kettle/screen-yushan/yushan_month.kjb |   6 +-
 .../screen-yushan/yushan_month_delete_co.ktr  | 211 +++++++++++++++++-
 .../screen-yushan/yushan_month_delete_st.ktr  | 173 +++++++++++++-
 .../screen-yushan/yushan_street_month.kjb     |  55 +----
 6 files changed, 471 insertions(+), 70 deletions(-)

diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete_month.ktr
index 5b32596..31ef07c 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete_month.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_delete_month.ktr
@@ -514,7 +514,7 @@
   <order>
   </order>
   <step>
-    <name>清空议题项目分类表</name>
+    <name>清空议题项目分类表-年</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -551,6 +551,92 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>清空新闻表</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>DELETE
+FROM
+	ys_news
+WHERE
+	comm_id IS NULL
+AND cal_date = DATE_FORMAT(CURDATE(), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>347</xloc>
+      <yloc>197</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空议题项目分类表-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>DELETE
+FROM
+	ys_classify
+WHERE
+	comm_id IS NULL
+AND cal_date = DATE_FORMAT(CURDATE(), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>301</xloc>
+      <yloc>405</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb
index beaccba..4b56899 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_month.kjb
@@ -359,7 +359,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>496</xloc>
+      <xloc>560</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -419,7 +419,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>688</xloc>
+      <xloc>752</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -457,7 +457,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>496</xloc>
+      <xloc>560</xloc>
       <yloc>320</yloc>
       <attributes_kjc/>
     </entry>
@@ -495,7 +495,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>368</xloc>
+      <xloc>400</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
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 174eccf..9c961a2 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb
@@ -941,7 +941,7 @@ true;
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>清空新闻表</name>
+      <name>清空相关表</name>
       <description/>
       <type>TRANS</type>
       <attributes/>
@@ -1207,7 +1207,7 @@ true;
     </hop>
     <hop>
       <from>Start</from>
-      <to>清空新闻表</to>
+      <to>清空相关表</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1215,7 +1215,7 @@ true;
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>清空新闻表</from>
+      <from>清空相关表</from>
       <to>街道下标</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr
index 9fd7eab..7e809ac 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr
@@ -547,7 +547,45 @@
     </remotesteps>
     <GUI>
       <xloc>528</xloc>
-      <yloc>336</yloc>
+      <yloc>208</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空年度信息-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_commu_hot_topic where comm_id = ${commId} AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>528</xloc>
+      <yloc>320</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -567,7 +605,45 @@
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId}  AND comm_id IS NOT NULL;;</sql>
+    <sql>delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId};</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>688</xloc>
+      <yloc>208</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空新闻资讯-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_news where comm_id = ${commId} AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
     <set_params>N</set_params>
     <insert_field/>
     <update_field/>
@@ -584,8 +660,8 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>672</xloc>
-      <yloc>368</yloc>
+      <xloc>688</xloc>
+      <yloc>320</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -622,8 +698,46 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>576</xloc>
-      <yloc>464</yloc>
+      <xloc>864</xloc>
+      <yloc>208</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空物业考核统计表-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_pro_chk_score where comm_id = ${commId} AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>864</xloc>
+      <yloc>320</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -660,8 +774,89 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>432</xloc>
-      <yloc>432</yloc>
+      <xloc>368</xloc>
+      <yloc>208</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空议题项目分类表-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_classify where comm_id = ${commId} AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>368</xloc>
+      <yloc>320</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空议题项目趋势分析-按月统计</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>DELETE
+FROM
+	ys_trend_month
+WHERE
+	comm_id = ${commId}
+AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>368</xloc>
+      <yloc>448</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
index a7add19..847bc76 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr
@@ -514,7 +514,7 @@
   <order>
   </order>
   <step>
-    <name>清空新闻资讯</name>
+    <name>清空新闻表-月</name>
     <type>ExecSQL</type>
     <description/>
     <distribute>Y</distribute>
@@ -529,7 +529,12 @@
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
     <quoteString>N</quoteString>
-    <sql>delete from ys_news where cal_date like YEAR (NOW()) AND comm_id IS NULL ;</sql>
+    <sql>DELETE
+FROM
+	ys_news
+WHERE
+	comm_id IS NULL
+AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
     <set_params>N</set_params>
     <insert_field/>
     <update_field/>
@@ -546,11 +551,173 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>560</xloc>
+      <xloc>432</xloc>
+      <yloc>128</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空新闻资讯-年</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_news where cal_date = YEAR (NOW()) AND comm_id IS NULL ;</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>656</xloc>
+      <yloc>128</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空议题项目分类表-年</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_classify where comm_id IS NULL and cal_date = YEAR(NOW());</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>656</xloc>
       <yloc>256</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>清空议题项目分类表-月</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>DELETE
+FROM
+	ys_classify
+WHERE
+	comm_id IS NULL
+AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>432</xloc>
+      <yloc>256</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>清空议题项目趋势分析-按月统计</name>
+    <type>ExecSQL</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>target_yushan</connection>
+    <execute_each_row>N</execute_each_row>
+    <single_statement>N</single_statement>
+    <replace_variables>Y</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>DELETE
+FROM
+	ys_trend_month
+WHERE
+	comm_id IS NULL
+AND cal_date = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m')</sql>
+    <set_params>N</set_params>
+    <insert_field/>
+    <update_field/>
+    <delete_field/>
+    <read_field/>
+    <arguments>
+    </arguments>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>176</xloc>
+      <yloc>208</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>
diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb
index 10180a8..f5efda5 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb
@@ -321,7 +321,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>384</xloc>
+      <xloc>336</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -419,7 +419,7 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>768</xloc>
+      <xloc>816</xloc>
       <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
@@ -457,44 +457,6 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>768</xloc>
-      <yloc>128</yloc>
-      <attributes_kjc/>
-    </entry>
-    <entry>
-      <name>写入网格数据表-清空月度数据</name>
-      <description/>
-      <type>TRANS</type>
-      <attributes/>
-      <specification_method>filename</specification_method>
-      <trans_object_id/>
-      <filename>${Internal.Entry.Current.Directory}/screen_totality_street_delete_month.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>576</xloc>
       <yloc>128</yloc>
       <attributes_kjc/>
@@ -510,15 +472,6 @@
       <evaluation>Y</evaluation>
       <unconditional>N</unconditional>
     </hop>
-    <hop>
-      <from>街道ID,NAME</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>Start</from>
       <to>街道ID,NAME</to>
@@ -530,7 +483,7 @@
     </hop>
     <hop>
       <from>街道ID,NAME</from>
-      <to>写入网格数据表-清空月度数据</to>
+      <to>获取街道信息变量</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -538,7 +491,7 @@
       <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>写入网格数据表-清空月度数据</from>
+      <from>街道ID,NAME</from>
       <to>写入表</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>