diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr
index 1d0e84d..1fb65fc 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm.ktr
@@ -578,6 +578,11 @@ FROM
 WHERE
 	type_key = 'community_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC 
@@ -592,11 +597,11 @@ ORDER BY
       <value-meta>
         <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>grid_amount</name>
+        <name>COMM_ID</name>
         <length>15</length>
         <precision>0</precision>
-        <origin>网格数</origin>
-        <comments>grid_amount</comments>
+        <origin>查询变量 社区id,name</origin>
+        <comments>COMM_ID</comments>
         <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
         <grouping_symbol>,</grouping_symbol>
@@ -612,6 +617,29 @@ ORDER BY
         <date_format_timezone>Asia/Shanghai</date_format_timezone>
         <lenient_string_to_number>N</lenient_string_to_number>
       </value-meta>
+      <value-meta>
+        <type>String</type>
+        <storagetype>normal</storagetype>
+        <name>COMM_NAME</name>
+        <length>50</length>
+        <precision>-1</precision>
+        <origin>查询变量 社区id,name</origin>
+        <comments>COMM_NAME</comments>
+        <conversion_Mask/>
+        <decimal_symbol>.</decimal_symbol>
+        <grouping_symbol>,</grouping_symbol>
+        <currency_symbol/>
+        <trim_type>none</trim_type>
+        <case_insensitive>N</case_insensitive>
+        <collator_disabled>Y</collator_disabled>
+        <collator_strength>0</collator_strength>
+        <sort_descending>N</sort_descending>
+        <output_padding>N</output_padding>
+        <date_format_lenient>N</date_format_lenient>
+        <date_format_locale>zh_CN</date_format_locale>
+        <date_format_timezone>Asia/Shanghai</date_format_timezone>
+        <lenient_string_to_number>N</lenient_string_to_number>
+      </value-meta>
     </row-meta>
     <attributes/>
     <cluster_schema/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr
index 3551cce..d8ad816 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_query_comm_info.ktr
@@ -537,6 +537,11 @@ FROM
 WHERE
 	type_key = 'community_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC;</sql>
@@ -553,7 +558,7 @@ ORDER BY
         <name>comm_amount</name>
         <length>15</length>
         <precision>0</precision>
-        <origin>街道数</origin>
+        <origin>社区数</origin>
         <comments>comm_amount</comments>
         <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr
index 161eb79..a06c40a 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_comm_update.ktr
@@ -601,7 +601,7 @@ VALUES
 )
 VALUES
 	(
-		${commId}, '${commName}', curdate(), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
+		${commId}, '${commName}', DATE_SUB(CURDATE(), INTERVAL 1 DAY), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr
index 7bb1359..12bcb29 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid.ktr
@@ -578,6 +578,11 @@ FROM
 WHERE
 	type_key = 'grid_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC 
@@ -592,11 +597,11 @@ ORDER BY
       <value-meta>
         <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>grid_amount</name>
+        <name>GRID_ID</name>
         <length>15</length>
         <precision>0</precision>
-        <origin>网格数</origin>
-        <comments>grid_amount</comments>
+        <origin>查询变量 网格id,name</origin>
+        <comments>GRID_ID</comments>
         <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
         <grouping_symbol>,</grouping_symbol>
@@ -612,6 +617,29 @@ ORDER BY
         <date_format_timezone>Asia/Shanghai</date_format_timezone>
         <lenient_string_to_number>N</lenient_string_to_number>
       </value-meta>
+      <value-meta>
+        <type>String</type>
+        <storagetype>normal</storagetype>
+        <name>GRID_NAME</name>
+        <length>50</length>
+        <precision>-1</precision>
+        <origin>查询变量 网格id,name</origin>
+        <comments>GRID_NAME</comments>
+        <conversion_Mask/>
+        <decimal_symbol>.</decimal_symbol>
+        <grouping_symbol>,</grouping_symbol>
+        <currency_symbol/>
+        <trim_type>none</trim_type>
+        <case_insensitive>N</case_insensitive>
+        <collator_disabled>Y</collator_disabled>
+        <collator_strength>0</collator_strength>
+        <sort_descending>N</sort_descending>
+        <output_padding>N</output_padding>
+        <date_format_lenient>N</date_format_lenient>
+        <date_format_locale>zh_CN</date_format_locale>
+        <date_format_timezone>Asia/Shanghai</date_format_timezone>
+        <lenient_string_to_number>N</lenient_string_to_number>
+      </value-meta>
     </row-meta>
     <attributes/>
     <cluster_schema/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr
index 7737ec8..5801247 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_grid_query_grid_info.ktr
@@ -537,6 +537,11 @@ FROM
 WHERE
 	type_key = 'grid_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC;</sql>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr
index c5bbe86..dbf7425 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street.ktr
@@ -578,6 +578,11 @@ FROM
 WHERE
 	type_key = 'street_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC 
@@ -592,11 +597,11 @@ ORDER BY
       <value-meta>
         <type>Integer</type>
         <storagetype>normal</storagetype>
-        <name>grid_amount</name>
+        <name>STREET_ID</name>
         <length>15</length>
         <precision>0</precision>
-        <origin>网格数</origin>
-        <comments>grid_amount</comments>
+        <origin>查询变量 街道id,name</origin>
+        <comments>STREET_ID</comments>
         <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
         <grouping_symbol>,</grouping_symbol>
@@ -612,6 +617,29 @@ ORDER BY
         <date_format_timezone>Asia/Shanghai</date_format_timezone>
         <lenient_string_to_number>N</lenient_string_to_number>
       </value-meta>
+      <value-meta>
+        <type>String</type>
+        <storagetype>normal</storagetype>
+        <name>STREET_NAME</name>
+        <length>50</length>
+        <precision>-1</precision>
+        <origin>查询变量 街道id,name</origin>
+        <comments>STREET_NAME</comments>
+        <conversion_Mask/>
+        <decimal_symbol>.</decimal_symbol>
+        <grouping_symbol>,</grouping_symbol>
+        <currency_symbol/>
+        <trim_type>none</trim_type>
+        <case_insensitive>N</case_insensitive>
+        <collator_disabled>Y</collator_disabled>
+        <collator_strength>0</collator_strength>
+        <sort_descending>N</sort_descending>
+        <output_padding>N</output_padding>
+        <date_format_lenient>N</date_format_lenient>
+        <date_format_locale>zh_CN</date_format_locale>
+        <date_format_timezone>Asia/Shanghai</date_format_timezone>
+        <lenient_string_to_number>N</lenient_string_to_number>
+      </value-meta>
     </row-meta>
     <attributes/>
     <cluster_schema/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr
index e573d4c..5899b95 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_query_street_info.ktr
@@ -537,6 +537,11 @@ FROM
 WHERE
 	type_key = 'street_party' 
 	AND del_flag = 0 
+	AND id NOT IN (
+		1258690654403125249,
+		1258690914995232770,
+		1258691044142047233
+	)
 ORDER BY
 	create_date ASC,
 	id ASC;</sql>
@@ -553,7 +558,7 @@ ORDER BY
         <name>street_amount</name>
         <length>15</length>
         <precision>0</precision>
-        <origin>网格数</origin>
+        <origin>街道数</origin>
         <comments>street_amount</comments>
         <conversion_Mask>####0;-####0</conversion_Mask>
         <decimal_symbol>.</decimal_symbol>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr
index 4fb8682..8b8cd5f 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_totality_street_update.ktr
@@ -597,7 +597,7 @@ VALUES
 )
 VALUES
 	(
-		curdate(), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
+		DATE_SUB(CURDATE(), INTERVAL 1 DAY), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr
index 00fd539..77c7a5c 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_charity_overview_update.ktr
@@ -538,7 +538,7 @@
 )
 VALUES
 	(
-		'${activity}', '${volunteer}', curdate(), now(), null
+		'${activity}', '${volunteer}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), now(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
index 9867365..463f5bf 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_commu_hot_topic_update.ktr
@@ -2051,7 +2051,7 @@ GROUP BY
 	${commId} as comm_id,
 	'${commName}' as comm_name,
 	COUNT(id) AS value,
-	DATE_FORMAT(NOW(), '%Y-%m') AS cal_date,
+	DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') AS cal_date,
 	NEWS_PROPERTY AS name,
 	now() AS create_time
 FROM
@@ -2101,7 +2101,7 @@ GROUP BY
 	id AS topic_id,
 	EVENT_CONTENT AS name,
 	COMMENT_NUM AS value,
-	DATE_FORMAT(NOW(), '%Y-%m') AS cal_date,
+	DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') AS cal_date,
 	now() AS create_time
 FROM
 	epdc_events
@@ -2310,7 +2310,7 @@ LIMIT 5</sql>
     <sql>SELECT
 	${commId} as comm_id,
 	'${commName}' as comm_name,
-	DATE_FORMAT(NOW(), '%Y-%m') AS cal_date,
+	DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') AS cal_date,
 	avg(es.SCORE) AS score_num,
 	sum(
 		CASE
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr
index d91009f..c4d62e9 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_grid_rank_month_update.ktr
@@ -540,7 +540,7 @@
 )
 VALUES
 	(
-		DATE_FORMAT(NOW(),'%Y-%m'), '${communityGrid}', ${gridId}, ${topic_num}, ${project_num}, NOW(), null
+		DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${topic_num}, ${project_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
@@ -631,7 +631,7 @@ VALUES
 )
 VALUES
 	(
-		${commId}, '${commName}', DATE_FORMAT(NOW(),'%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null
+		${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
index 24c55df..37df5c7 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update.ktr
@@ -998,7 +998,7 @@ GROUP BY
     <connection>source_ys_news</connection>
     <sql>SELECT
 	COUNT(id) AS value,
-	DATE_FORMAT(NOW(), '%Y-%m') AS cal_date,
+	DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m') AS cal_date,
 	NEWS_PROPERTY AS name,
 	now() AS create_time
 FROM
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr
index 8c78012..5abfb4b 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_news_update_year.ktr
@@ -704,8 +704,8 @@ FROM
 WHERE
 	DEL_FLAG = '0'
 	AND find_in_set(${streetId}, ALL_DEPT_IDS)
-	AND 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' )
+	AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 YEAR)
+GROUP BY
 	NEWS_PROPERTY</sql>
     <limit>0</limit>
     <lookup/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr
index 416c979..5ad64ed 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_co.ktr
@@ -542,7 +542,7 @@
 )
 VALUES
 	(
-		${commId}, '${commName}', DATE_FORMAT(NOW(),'%Y-%m'), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
+		${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr b/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr
index ccc318f..c33f4e2 100644
--- a/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr
+++ b/epdc-cloud-property/doc/yushan-kettle/screen_ys_trend_month_update_st.ktr
@@ -540,7 +540,7 @@
 )
 VALUES
 	(
-		DATE_FORMAT(NOW(),'%Y-%m'), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
+		DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>
diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb
index 72416b3..51f0e99 100644
--- a/epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb
+++ b/epdc-cloud-property/doc/yushan-kettle/yushan_comm_year.kjb
@@ -325,44 +325,6 @@
       <yloc>208</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_comm_query_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>416</xloc>
-      <yloc>208</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>Start</name>
       <description/>
@@ -385,44 +347,6 @@
       <yloc>208</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_ys_trend_month_update_co.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>608</xloc>
-      <yloc>208</yloc>
-      <attributes_kjc/>
-    </entry>
     <entry>
       <name>写入表</name>
       <description/>
@@ -457,21 +381,12 @@
       <parallel>N</parallel>
       <draw>Y</draw>
       <nr>0</nr>
-      <xloc>608</xloc>
-      <yloc>320</yloc>
+      <xloc>464</xloc>
+      <yloc>208</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
   <hops>
-    <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>
@@ -481,15 +396,6 @@
       <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>社区ID,NAME</from>
       <to>写入表</to>
diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb
index 35c1bb5..56767d6 100644
--- a/epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb
+++ b/epdc-cloud-property/doc/yushan-kettle/yushan_day.kjb
@@ -294,8 +294,8 @@
       <attributes/>
       <start>Y</start>
       <dummy>N</dummy>
-      <repeat>Y</repeat>
-      <schedulerType>2</schedulerType>
+      <repeat>N</repeat>
+      <schedulerType>1</schedulerType>
       <intervalSeconds>10</intervalSeconds>
       <intervalMinutes>0</intervalMinutes>
       <hour>0</hour>
diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb
index b4c122a..5075bae 100644
--- a/epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb
+++ b/epdc-cloud-property/doc/yushan-kettle/yushan_month.kjb
@@ -294,8 +294,8 @@
       <attributes/>
       <start>Y</start>
       <dummy>N</dummy>
-      <repeat>Y</repeat>
-      <schedulerType>4</schedulerType>
+      <repeat>N</repeat>
+      <schedulerType>1</schedulerType>
       <intervalSeconds>10</intervalSeconds>
       <intervalMinutes>0</intervalMinutes>
       <hour>0</hour>
diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb b/epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb
index e88697c..b4587a3 100644
--- a/epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb
+++ b/epdc-cloud-property/doc/yushan-kettle/yushan_year.kjb
@@ -864,6 +864,44 @@ true;
       <yloc>1040</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}/yushan_year_delete.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>208</xloc>
+      <yloc>656</yloc>
+      <attributes_kjc/>
+    </entry>
   </entries>
   <hops>
     <hop>
@@ -1057,7 +1095,7 @@ true;
     </hop>
     <hop>
       <from>Start</from>
-      <to>网格下标</to>
+      <to>清空表</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -1065,22 +1103,31 @@ true;
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>Start</from>
+      <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>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
+      <unconditional>N</unconditional>
     </hop>
     <hop>
-      <from>Start</from>
+      <from>清空表</from>
       <to>社区下标</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
-      <unconditional>Y</unconditional>
+      <unconditional>N</unconditional>
     </hop>
   </hops>
   <notepads>
diff --git a/epdc-cloud-property/doc/yushan-kettle/yushan_year_delete.ktr b/epdc-cloud-property/doc/yushan-kettle/yushan_year_delete.ktr
new file mode 100644
index 0000000..e2937eb
--- /dev/null
+++ b/epdc-cloud-property/doc/yushan-kettle/yushan_year_delete.ktr
@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<transformation>
+  <info>
+    <name>yushan_year_delete</name>
+    <description/>
+    <extended_description/>
+    <trans_version/>
+    <trans_type>Normal</trans_type>
+    <trans_status>0</trans_status>
+    <directory>/</directory>
+    <parameters>
+    </parameters>
+    <log>
+      <trans-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <size_limit_lines/>
+        <interval/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STATUS</id>
+          <enabled>Y</enabled>
+          <name>STATUS</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+          <subject/>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+          <subject/>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>STARTDATE</id>
+          <enabled>Y</enabled>
+          <name>STARTDATE</name>
+        </field>
+        <field>
+          <id>ENDDATE</id>
+          <enabled>Y</enabled>
+          <name>ENDDATE</name>
+        </field>
+        <field>
+          <id>LOGDATE</id>
+          <enabled>Y</enabled>
+          <name>LOGDATE</name>
+        </field>
+        <field>
+          <id>DEPDATE</id>
+          <enabled>Y</enabled>
+          <name>DEPDATE</name>
+        </field>
+        <field>
+          <id>REPLAYDATE</id>
+          <enabled>Y</enabled>
+          <name>REPLAYDATE</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>Y</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+        <field>
+          <id>EXECUTING_SERVER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_SERVER</name>
+        </field>
+        <field>
+          <id>EXECUTING_USER</id>
+          <enabled>N</enabled>
+          <name>EXECUTING_USER</name>
+        </field>
+        <field>
+          <id>CLIENT</id>
+          <enabled>N</enabled>
+          <name>CLIENT</name>
+        </field>
+      </trans-log-table>
+      <perf-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <interval/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>SEQ_NR</id>
+          <enabled>Y</enabled>
+          <name>SEQ_NR</name>
+        </field>
+        <field>
+          <id>LOGDATE</id>
+          <enabled>Y</enabled>
+          <name>LOGDATE</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STEPNAME</id>
+          <enabled>Y</enabled>
+          <name>STEPNAME</name>
+        </field>
+        <field>
+          <id>STEP_COPY</id>
+          <enabled>Y</enabled>
+          <name>STEP_COPY</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>INPUT_BUFFER_ROWS</id>
+          <enabled>Y</enabled>
+          <name>INPUT_BUFFER_ROWS</name>
+        </field>
+        <field>
+          <id>OUTPUT_BUFFER_ROWS</id>
+          <enabled>Y</enabled>
+          <name>OUTPUT_BUFFER_ROWS</name>
+        </field>
+      </perf-log-table>
+      <channel-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>LOGGING_OBJECT_TYPE</id>
+          <enabled>Y</enabled>
+          <name>LOGGING_OBJECT_TYPE</name>
+        </field>
+        <field>
+          <id>OBJECT_NAME</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_NAME</name>
+        </field>
+        <field>
+          <id>OBJECT_COPY</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_COPY</name>
+        </field>
+        <field>
+          <id>REPOSITORY_DIRECTORY</id>
+          <enabled>Y</enabled>
+          <name>REPOSITORY_DIRECTORY</name>
+        </field>
+        <field>
+          <id>FILENAME</id>
+          <enabled>Y</enabled>
+          <name>FILENAME</name>
+        </field>
+        <field>
+          <id>OBJECT_ID</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_ID</name>
+        </field>
+        <field>
+          <id>OBJECT_REVISION</id>
+          <enabled>Y</enabled>
+          <name>OBJECT_REVISION</name>
+        </field>
+        <field>
+          <id>PARENT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>PARENT_CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>ROOT_CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>ROOT_CHANNEL_ID</name>
+        </field>
+      </channel-log-table>
+      <step-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>TRANSNAME</id>
+          <enabled>Y</enabled>
+          <name>TRANSNAME</name>
+        </field>
+        <field>
+          <id>STEPNAME</id>
+          <enabled>Y</enabled>
+          <name>STEPNAME</name>
+        </field>
+        <field>
+          <id>STEP_COPY</id>
+          <enabled>Y</enabled>
+          <name>STEP_COPY</name>
+        </field>
+        <field>
+          <id>LINES_READ</id>
+          <enabled>Y</enabled>
+          <name>LINES_READ</name>
+        </field>
+        <field>
+          <id>LINES_WRITTEN</id>
+          <enabled>Y</enabled>
+          <name>LINES_WRITTEN</name>
+        </field>
+        <field>
+          <id>LINES_UPDATED</id>
+          <enabled>Y</enabled>
+          <name>LINES_UPDATED</name>
+        </field>
+        <field>
+          <id>LINES_INPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_INPUT</name>
+        </field>
+        <field>
+          <id>LINES_OUTPUT</id>
+          <enabled>Y</enabled>
+          <name>LINES_OUTPUT</name>
+        </field>
+        <field>
+          <id>LINES_REJECTED</id>
+          <enabled>Y</enabled>
+          <name>LINES_REJECTED</name>
+        </field>
+        <field>
+          <id>ERRORS</id>
+          <enabled>Y</enabled>
+          <name>ERRORS</name>
+        </field>
+        <field>
+          <id>LOG_FIELD</id>
+          <enabled>N</enabled>
+          <name>LOG_FIELD</name>
+        </field>
+      </step-log-table>
+      <metrics-log-table>
+        <connection/>
+        <schema/>
+        <table/>
+        <timeout_days/>
+        <field>
+          <id>ID_BATCH</id>
+          <enabled>Y</enabled>
+          <name>ID_BATCH</name>
+        </field>
+        <field>
+          <id>CHANNEL_ID</id>
+          <enabled>Y</enabled>
+          <name>CHANNEL_ID</name>
+        </field>
+        <field>
+          <id>LOG_DATE</id>
+          <enabled>Y</enabled>
+          <name>LOG_DATE</name>
+        </field>
+        <field>
+          <id>METRICS_DATE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_DATE</name>
+        </field>
+        <field>
+          <id>METRICS_CODE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_CODE</name>
+        </field>
+        <field>
+          <id>METRICS_DESCRIPTION</id>
+          <enabled>Y</enabled>
+          <name>METRICS_DESCRIPTION</name>
+        </field>
+        <field>
+          <id>METRICS_SUBJECT</id>
+          <enabled>Y</enabled>
+          <name>METRICS_SUBJECT</name>
+        </field>
+        <field>
+          <id>METRICS_TYPE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_TYPE</name>
+        </field>
+        <field>
+          <id>METRICS_VALUE</id>
+          <enabled>Y</enabled>
+          <name>METRICS_VALUE</name>
+        </field>
+      </metrics-log-table>
+    </log>
+    <maxdate>
+      <connection/>
+      <table/>
+      <field/>
+      <offset>0.0</offset>
+      <maxdiff>0.0</maxdiff>
+    </maxdate>
+    <size_rowset>10000</size_rowset>
+    <sleep_time_empty>50</sleep_time_empty>
+    <sleep_time_full>50</sleep_time_full>
+    <unique_connections>N</unique_connections>
+    <feedback_shown>Y</feedback_shown>
+    <feedback_size>50000</feedback_size>
+    <using_thread_priorities>Y</using_thread_priorities>
+    <shared_objects_file/>
+    <capture_step_performance>N</capture_step_performance>
+    <step_performance_capturing_delay>1000</step_performance_capturing_delay>
+    <step_performance_capturing_size_limit>100</step_performance_capturing_size_limit>
+    <dependencies>
+    </dependencies>
+    <partitionschemas>
+    </partitionschemas>
+    <slaveservers>
+    </slaveservers>
+    <clusterschemas>
+    </clusterschemas>
+    <created_user>-</created_user>
+    <created_date>2020/04/27 09:32:01.126</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2020/04/27 09:32:01.126</modified_date>
+    <key_for_session_key>H4sIAAAAAAAAAAMAAAAAAAAAAAA=</key_for_session_key>
+    <is_key_private>N</is_key_private>
+  </info>
+  <notepads>
+  </notepads>
+  <connection>
+    <name>target_yushan</name>
+    <server>${db.mysql.epdc.target.ys.host}</server>
+    <type>MYSQL</type>
+    <access>Native</access>
+    <database>${db.mysql.target.schema.yushandb}</database>
+    <port>${db.mysql.epdc.target.ys.port}</port>
+    <username>${db.mysql.epdc.target.ys.username}</username>
+    <password>${db.mysql.epdc.target.ys.password}</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute>
+        <code>EXTRA_OPTION_MYSQL.allowMultiQueries</code>
+        <attribute>true</attribute>
+      </attribute>
+      <attribute>
+        <code>EXTRA_OPTION_MYSQL.characterEncoding</code>
+        <attribute>utf8</attribute>
+      </attribute>
+      <attribute>
+        <code>EXTRA_OPTION_MYSQL.serverTimezone</code>
+        <attribute>Asia/Shanghai</attribute>
+      </attribute>
+      <attribute>
+        <code>EXTRA_OPTION_MYSQL.useSSL</code>
+        <attribute>false</attribute>
+      </attribute>
+      <attribute>
+        <code>EXTRA_OPTION_MYSQL.useUnicode</code>
+        <attribute>true</attribute>
+      </attribute>
+      <attribute>
+        <code>FORCE_IDENTIFIERS_TO_LOWERCASE</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>FORCE_IDENTIFIERS_TO_UPPERCASE</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>IS_CLUSTERED</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>PORT_NUMBER</code>
+        <attribute>${db.mysql.epdc.target.ys.port}</attribute>
+      </attribute>
+      <attribute>
+        <code>PRESERVE_RESERVED_WORD_CASE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>QUOTE_ALL_FIELDS</code>
+        <attribute>N</attribute>
+      </attribute>
+      <attribute>
+        <code>STREAM_RESULTS</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>SUPPORTS_BOOLEAN_DATA_TYPE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>SUPPORTS_TIMESTAMP_DATA_TYPE</code>
+        <attribute>Y</attribute>
+      </attribute>
+      <attribute>
+        <code>USE_POOLING</code>
+        <attribute>N</attribute>
+      </attribute>
+    </attributes>
+  </connection>
+  <order>
+  </order>
+  <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>N</replace_variables>
+    <quoteString>N</quoteString>
+    <sql>delete from ys_grid_rank where cal_date = YEAR (NOW()) -1 ;
+delete from ys_grid_reg where cal_date = YEAR (NOW()) -1 ;
+delete from ys_news where cal_date = YEAR (NOW()) -1 ;
+delete from ys_commu_hot_topic where cal_date = YEAR (NOW()) -1 ;
+delete from ys_pro_chk_score where cal_date = YEAR (NOW()) -1 ;
+
+</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>544</xloc>
+      <yloc>96</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step_error_handling>
+  </step_error_handling>
+  <slave-step-copy-partition-distribution>
+  </slave-step-copy-partition-distribution>
+  <slave_transformation>N</slave_transformation>
+  <attributes/>
+</transformation>