过滤不需要的网格ID

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（党员+居民）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -2087,7 +2087,7 @@ AND i.grid_id NOT IN (
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（党员+居民）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -2104,7 +2104,6 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
-	AND u.PARTY_FLAG = '0'
 AND u.dept_id NOT IN (
   1258690654403125249,
   1258690914995232770,

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（和）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -902,6 +902,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>
     <lookup/>
@@ -1753,7 +1759,7 @@ AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERV
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（和）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1770,6 +1776,12 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>
     <lookup/>
@@ -1904,6 +1916,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 	AND find_in_set('${commId}', u.ALL_DEPT_IDS)
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>
@@ -1946,6 +1964,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
 	AND find_in_set('${commId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（和）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -902,6 +902,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>
     <lookup/>
@@ -1763,7 +1769,7 @@ AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL ${dayIndex}+1 DAY);</sql>
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（和）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1780,6 +1786,12 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>
     <lookup/>
@@ -1914,6 +1926,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 	AND find_in_set('${commId}', u.ALL_DEPT_IDS)
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>
@@ -1956,6 +1974,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY)
 	AND find_in_set('${commId}', u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>

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

@@ -738,7 +738,7 @@
   </connection>
   <order>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（居民+党员）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -2539,7 +2539,7 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（居民+党员）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -2556,7 +2556,6 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
-AND u.PARTY_FLAG = '0'
 AND u.dept_id NOT IN (
   1258690654403125249,
   1258690914995232770,

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

@@ -738,7 +738,7 @@
   </connection>
   <order>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（居民+党员）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -1731,6 +1731,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
 AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -1866,6 +1872,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 AND u.PARTY_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 	AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')
 	AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -2000,6 +2012,12 @@ FROM
 	epdc_party_members
 WHERE
 	DEL_FLAG = '0'
+AND dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH)
 AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -2024,7 +2042,7 @@ AND find_in_set(${gridId}, ALL_DEPT_IDS);</sql>
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（居民+党员）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -2041,6 +2059,12 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.REGISTER_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH)
 AND find_in_set(${gridId}, u.ALL_DEPT_IDS);</sql>
     <limit>0</limit>
@@ -2697,7 +2721,7 @@ AND u.dept_id = ${gridId};</sql>
     <fields>
       <field>
         <field_name>reg_party_num</field_name>
-        <variable_name>reg_party_num</variable_name>
+        <variable_name>register_party_num</variable_name>
         <variable_type>PARENT_JOB</variable_type>
         <default_value/>
       </field>

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（党员+居民）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -1898,7 +1898,7 @@ AND i.grid_id NOT IN (
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（党员+居民）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1915,7 +1915,6 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
-	AND u.PARTY_FLAG = '0'
 AND u.dept_id NOT IN (
   1258690654403125249,
   1258690914995232770,

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（和）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -902,6 +902,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>
     <lookup/>
@@ -1753,7 +1759,7 @@ AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERV
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（和）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1770,6 +1776,12 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>
     <lookup/>
@@ -1904,6 +1916,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 	AND find_in_set('${streetId}', u.ALL_DEPT_IDS)
 AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m')</sql>
     <limit>0</limit>

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

@@ -823,7 +823,7 @@
       <enabled>Y</enabled>
     </hop>
     <hop>
-      <from>注册用户数</from>
+      <from>注册用户数（和）</from>
       <to>设置注册用户数变量</to>
       <enabled>Y</enabled>
     </hop>
@@ -902,6 +902,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>
     <lookup/>
@@ -1763,7 +1769,7 @@ AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL ${dayIndex}+1 DAY);</sql>
     </GUI>
   </step>
   <step>
-    <name>注册用户数</name>
+    <name>注册用户数（和）</name>
     <type>TableInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1780,6 +1786,12 @@ FROM
 	epdc_user u
 WHERE
 	u.DEL_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>
     <lookup/>
@@ -1914,6 +1926,12 @@ FROM
 WHERE
 	u.DEL_FLAG = '0'
 	AND u.PARTY_FLAG = '1'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
 	AND find_in_set('${streetId}', u.ALL_DEPT_IDS)
 AND u.CREATED_TIME &lt; DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY);</sql>
     <limit>0</limit>