diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
index a1902de..0c316b0 100644
--- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
+++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr
@@ -793,6 +793,118 @@
       <enabled>Y</enabled>
     </hop>
   </order>
+  <step>
+    <name>去年已办结项目数</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>source_ys_events</connection>
+    <sql>SELECT
+	count(id) AS finish_project_num
+FROM
+	epdc_item
+WHERE
+	DEL_FLAG = '0'
+AND ITEM_STATE = '10'
+AND YEAR (CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
+	AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+    <cached_row_meta_active>N</cached_row_meta_active>
+    <row-meta>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>participate_of_news</name>
+        <length>34</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>participate_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>read_of_news</name>
+        <length>32</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>read_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>like_of_news</name>
+        <length>32</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>like_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>992</xloc>
+      <yloc>272</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>去年总议题数项目数</name>
     <type>TableInput</type>
@@ -1245,6 +1357,7 @@ FROM
 	epdc_group
 WHERE
 	DEL_FLAG = '0'
+	AND STATE = '10'
 	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 find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
@@ -1362,6 +1475,117 @@ AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' )
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>去年项目数</name>
+    <type>TableInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <connection>source_ys_events</connection>
+    <sql>SELECT
+	COUNT(i.ID) AS project_num
+FROM
+	epdc_item i
+WHERE
+	i.DEL_FLAG = '0'
+AND YEAR (i.CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
+	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
+    <limit>0</limit>
+    <lookup/>
+    <execute_each_row>N</execute_each_row>
+    <variables_active>Y</variables_active>
+    <lazy_conversion_active>N</lazy_conversion_active>
+    <cached_row_meta_active>N</cached_row_meta_active>
+    <row-meta>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>participate_of_news</name>
+        <length>34</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>participate_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>read_of_news</name>
+        <length>32</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>read_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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>
+      <value-meta>
+        <type>BigNumber</type>
+        <storagetype>normal</storagetype>
+        <name>like_of_news</name>
+        <length>32</length>
+        <precision>0</precision>
+        <origin>新闻参与量阅读量点赞量</origin>
+        <comments>like_of_news</comments>
+        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
+        <decimal_symbol>.</decimal_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/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>992</xloc>
+      <yloc>192</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step>
     <name>社区ID，社区name</name>
     <type>TableInput</type>
@@ -1505,7 +1729,7 @@ AND del_flag = '0'</sql>
     </GUI>
   </step>
   <step>
-    <name>设置去年总议题数项目数变量</name>
+    <name>设置去年已办结项目数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1517,26 +1741,8 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>cal_date</field_name>
-        <variable_name>cal_date</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-      <field>
-        <field_name>grid_id</field_name>
-        <variable_name>grid_id</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-      <field>
-        <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-      <field>
-        <field_name>topic_num</field_name>
-        <variable_name>topic_num</variable_name>
+        <field_name>finish_project_num</field_name>
+        <variable_name>finish_project_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -1551,13 +1757,13 @@ AND del_flag = '0'</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>752</xloc>
-      <yloc>192</yloc>
+      <xloc>1232</xloc>
+      <yloc>272</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置去年用户注册党员数</name>
+    <name>设置去年总议题数项目数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1569,9 +1775,27 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_party_num</field_name>
-        <variable_name>reg_party_num</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
+        <field_name>cal_date</field_name>
+        <variable_name>cal_date</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+      <field>
+        <field_name>grid_id</field_name>
+        <variable_name>grid_id</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+      <field>
+        <field_name>project_num</field_name>
+        <variable_name>project_num</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+      <field>
+        <field_name>topic_num</field_name>
+        <variable_name>topic_num</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
     </fields>
@@ -1586,12 +1810,12 @@ AND del_flag = '0'</sql>
     </remotesteps>
     <GUI>
       <xloc>752</xloc>
-      <yloc>512</yloc>
+      <yloc>192</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置去年用户注册数</name>
+    <name>设置去年用户注册党员数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1603,8 +1827,8 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_user_num</field_name>
-        <variable_name>reg_user_num</variable_name>
+        <field_name>reg_party_num</field_name>
+        <variable_name>reg_party_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -1620,12 +1844,12 @@ AND del_flag = '0'</sql>
     </remotesteps>
     <GUI>
       <xloc>752</xloc>
-      <yloc>400</yloc>
+      <yloc>512</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置去年用户注册社群数</name>
+    <name>设置去年用户注册数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1637,8 +1861,8 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_group_num</field_name>
-        <variable_name>reg_group_num</variable_name>
+        <field_name>reg_user_num</field_name>
+        <variable_name>reg_user_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -1654,12 +1878,12 @@ AND del_flag = '0'</sql>
     </remotesteps>
     <GUI>
       <xloc>752</xloc>
-      <yloc>624</yloc>
+      <yloc>400</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置变量</name>
+    <name>设置去年用户注册社群数</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1671,16 +1895,10 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>topic_num</field_name>
-        <variable_name>topic_num</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value>0</default_value>
-      </field>
-      <field>
-        <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
+        <field_name>reg_group_num</field_name>
+        <variable_name>reg_group_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
-        <default_value>0</default_value>
+        <default_value/>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
@@ -1693,13 +1911,13 @@ AND del_flag = '0'</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>368</xloc>
-      <yloc>192</yloc>
+      <xloc>752</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置变量 3</name>
+    <name>设置去年项目数变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1711,10 +1929,10 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_user_num</field_name>
-        <variable_name>reg_user_num</variable_name>
+        <field_name>project_num</field_name>
+        <variable_name>project_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
-        <default_value>0</default_value>
+        <default_value/>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
@@ -1727,13 +1945,13 @@ AND del_flag = '0'</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>368</xloc>
-      <yloc>400</yloc>
+      <xloc>1232</xloc>
+      <yloc>192</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置变量 4</name>
+    <name>设置变量</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1745,8 +1963,14 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_party_num</field_name>
-        <variable_name>reg_party_num</variable_name>
+        <field_name>topic_num</field_name>
+        <variable_name>topic_num</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value>0</default_value>
+      </field>
+      <field>
+        <field_name>project_num</field_name>
+        <variable_name>project_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value>0</default_value>
       </field>
@@ -1762,12 +1986,12 @@ AND del_flag = '0'</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>512</yloc>
+      <yloc>192</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置变量 5</name>
+    <name>设置变量 3</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1779,8 +2003,8 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>reg_group_num</field_name>
-        <variable_name>reg_group_num</variable_name>
+        <field_name>reg_user_num</field_name>
+        <variable_name>reg_user_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value>0</default_value>
       </field>
@@ -1796,12 +2020,12 @@ AND del_flag = '0'</sql>
     </remotesteps>
     <GUI>
       <xloc>368</xloc>
-      <yloc>624</yloc>
+      <yloc>400</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置社区ID，社区name</name>
+    <name>设置变量 4</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1813,16 +2037,10 @@ AND del_flag = '0'</sql>
     </partitioning>
     <fields>
       <field>
-        <field_name>commId</field_name>
-        <variable_name>commId</variable_name>
-        <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
-      </field>
-      <field>
-        <field_name>commName</field_name>
-        <variable_name>commName</variable_name>
+        <field_name>reg_party_num</field_name>
+        <variable_name>reg_party_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
+        <default_value>0</default_value>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
@@ -1835,124 +2053,13 @@ AND del_flag = '0'</sql>
       </output>
     </remotesteps>
     <GUI>
-      <xloc>752</xloc>
-      <yloc>304</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>去年项目数</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>source_ys_events</connection>
-    <sql>SELECT
-	COUNT(i.ID) AS project_num
-FROM
-	epdc_item i
-WHERE
-	i.DEL_FLAG = '0'
-AND YEAR (i.CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
-	AND find_in_set(${gridId}, i.ALL_DEPT_IDS);</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-    <cached_row_meta_active>N</cached_row_meta_active>
-    <row-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>992</xloc>
-      <yloc>192</yloc>
+      <xloc>368</xloc>
+      <yloc>512</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置去年项目数变量</name>
+    <name>设置变量 5</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -1964,10 +2071,10 @@ AND YEAR (i.CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
     </partitioning>
     <fields>
       <field>
-        <field_name>project_num</field_name>
-        <variable_name>project_num</variable_name>
+        <field_name>reg_group_num</field_name>
+        <variable_name>reg_group_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
-        <default_value/>
+        <default_value>0</default_value>
       </field>
     </fields>
     <use_formatting>Y</use_formatting>
@@ -1980,125 +2087,13 @@ AND YEAR (i.CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
       </output>
     </remotesteps>
     <GUI>
-      <xloc>1232</xloc>
-      <yloc>192</yloc>
-      <draw>Y</draw>
-    </GUI>
-  </step>
-  <step>
-    <name>去年已办结项目数</name>
-    <type>TableInput</type>
-    <description/>
-    <distribute>Y</distribute>
-    <custom_distribution/>
-    <copies>1</copies>
-    <partitioning>
-      <method>none</method>
-      <schema_name/>
-    </partitioning>
-    <connection>source_ys_events</connection>
-    <sql>SELECT
-	count(id) AS finish_project_num
-FROM
-	epdc_item
-WHERE
-	DEL_FLAG = '0'
-AND ITEM_STATE = '10'
-AND YEAR (CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
-	AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
-    <limit>0</limit>
-    <lookup/>
-    <execute_each_row>N</execute_each_row>
-    <variables_active>Y</variables_active>
-    <lazy_conversion_active>N</lazy_conversion_active>
-    <cached_row_meta_active>N</cached_row_meta_active>
-    <row-meta>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>participate_of_news</name>
-        <length>34</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>participate_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>read_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>read_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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>
-      <value-meta>
-        <type>BigNumber</type>
-        <storagetype>normal</storagetype>
-        <name>like_of_news</name>
-        <length>32</length>
-        <precision>0</precision>
-        <origin>新闻参与量阅读量点赞量</origin>
-        <comments>like_of_news</comments>
-        <conversion_Mask>######0.0###################;-######0.0###################</conversion_Mask>
-        <decimal_symbol>.</decimal_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/>
-    <remotesteps>
-      <input>
-      </input>
-      <output>
-      </output>
-    </remotesteps>
-    <GUI>
-      <xloc>992</xloc>
-      <yloc>272</yloc>
+      <xloc>368</xloc>
+      <yloc>624</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
   <step>
-    <name>设置去年已办结项目数</name>
+    <name>设置社区ID，社区name</name>
     <type>SetVariable</type>
     <description/>
     <distribute>Y</distribute>
@@ -2110,8 +2105,14 @@ AND YEAR (CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
     </partitioning>
     <fields>
       <field>
-        <field_name>finish_project_num</field_name>
-        <variable_name>finish_project_num</variable_name>
+        <field_name>commId</field_name>
+        <variable_name>commId</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+      <field>
+        <field_name>commName</field_name>
+        <variable_name>commName</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>
@@ -2126,8 +2127,8 @@ AND YEAR (CREATED_TIME) = YEAR (		date_sub(now(), INTERVAL 1 YEAR)	)
       </output>
     </remotesteps>
     <GUI>
-      <xloc>1232</xloc>
-      <yloc>272</yloc>
+      <xloc>752</xloc>
+      <yloc>304</yloc>
       <draw>Y</draw>
     </GUI>
   </step>