修改概况表居民和党员逻辑

epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr

@@ -2417,7 +2417,8 @@ WHERE
 FROM
 	epdc_user u
 WHERE
-	u.DEL_FLAG = '0';</sql>
+	u.DEL_FLAG = '0'
+	AND find_in_set('${commId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
@@ -2590,6 +2591,7 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+	AND u.PARTY_FLAG = '0'
 	AND find_in_set('${commId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
@@ -2597,7 +2599,31 @@ WHERE
     <variables_active>Y</variables_active>
     <lazy_conversion_active>N</lazy_conversion_active>
     <cached_row_meta_active>N</cached_row_meta_active>
-    <row-meta/>
+    <row-meta>
+      <value-meta>
+        <type>Integer</type>
+        <storagetype>normal</storagetype>
+        <name>user_num</name>
+        <length>15</length>
+        <precision>0</precision>
+        <origin>街道用户数</origin>
+        <comments>user_num</comments>
+        <conversion_Mask>####0;-####0</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/>
     <remotesteps>

epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr

@@ -550,7 +550,7 @@
 )
 VALUES
 	(
-		${commId}, '${commName}', ${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${party_member_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, '${extend}', NOW(), null
+		${commId}, '${commName}', ${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, '${extend}', NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>

epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr

@@ -2404,14 +2404,39 @@ WHERE
 FROM
 	epdc_user u
 WHERE
-	u.DEL_FLAG = '0';</sql>
+	u.DEL_FLAG = '0'
+	AND find_in_set('${streetId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
     <execute_each_row>N</execute_each_row>
     <variables_active>N</variables_active>
     <lazy_conversion_active>N</lazy_conversion_active>
     <cached_row_meta_active>N</cached_row_meta_active>
-    <row-meta/>
+    <row-meta>
+      <value-meta>
+        <type>Integer</type>
+        <storagetype>normal</storagetype>
+        <name>user_all</name>
+        <length>15</length>
+        <precision>0</precision>
+        <origin>注册用户数</origin>
+        <comments>user_all</comments>
+        <conversion_Mask>####0;-####0</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/>
     <remotesteps>
@@ -2553,6 +2578,7 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+	AND u.PARTY_FLAG = '0'
 	AND find_in_set('${streetId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
     <lookup/>
@@ -2560,7 +2586,31 @@ WHERE
     <variables_active>Y</variables_active>
     <lazy_conversion_active>N</lazy_conversion_active>
     <cached_row_meta_active>N</cached_row_meta_active>
-    <row-meta/>
+    <row-meta>
+      <value-meta>
+        <type>Integer</type>
+        <storagetype>normal</storagetype>
+        <name>user_num</name>
+        <length>15</length>
+        <precision>0</precision>
+        <origin>街道用户数</origin>
+        <comments>user_num</comments>
+        <conversion_Mask>####0;-####0</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/>
     <remotesteps>

epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr

@@ -547,7 +547,7 @@
 )
 VALUES
 	(
-		${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${party_member_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, NOW(), null
+		${grid_num}, ${party_group_num}, ${user_num}, ${user_num} / ${user_all}, ${party_member_num}, IFNULL(${party_member_num} / ${user_all} , 0 ), ${case_num}, ${new_case_num}, ${project_num}, ${new_project_num}, ${news_num}, ${new_news_num}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>

epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_day.kjb

@@ -364,7 +364,7 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>写入表-街道1</name>
+      <name>写入表-街道</name>
       <description/>
       <type>TRANS</type>
       <attributes/>
@@ -462,7 +462,7 @@
       <attributes_kjc/>
     </entry>
     <entry>
-      <name>写入表-街道2</name>
+      <name>写入议题项目分类表</name>
       <description/>
       <type>TRANS</type>
       <attributes/>
@@ -496,7 +496,7 @@
       <draw>Y</draw>
       <nr>0</nr>
       <xloc>816</xloc>
-      <yloc>112</yloc>
+      <yloc>320</yloc>
       <attributes_kjc/>
     </entry>
   </entries>
@@ -530,7 +530,7 @@
     </hop>
     <hop>
       <from>写入网格数据表-清空月度数据</from>
-      <to>写入表-街道1</to>
+      <to>写入表-街道</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>
@@ -539,7 +539,7 @@
     </hop>
     <hop>
       <from>写入网格数据表-清空月度数据</from>
-      <to>写入表-街道2</to>
+      <to>写入议题项目分类表</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
       <enabled>Y</enabled>