Merge branch 'feature/yujt_comm_edu' into feature/yujt_police_group

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

@@ -827,6 +827,11 @@
       <to>设置大屏网格信息变量</to>
       <enabled>Y</enabled>
     </hop>
+    <hop>
+      <from>注册居民数</from>
+      <to>设置注册居民数变量</to>
+      <enabled>Y</enabled>
+    </hop>
   </order>
   <step>
     <name>大屏网格信息</name>
@@ -3704,6 +3709,87 @@ AND i.grid_id NOT IN (
       <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_user</connection>
+    <sql>SELECT
+	COUNT(u.id) register_number
+FROM
+	epdc_user u
+WHERE
+	u.DEL_FLAG = '0'
+AND u.PARTY_FLAG = '0'
+AND u.dept_id NOT IN (
+  1258690654403125249,
+  1258690914995232770,
+  1258691044142047233,
+  1258587880499798017
+ )
+AND find_in_set(${gridId}, u.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/>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>1008</xloc>
+      <yloc>464</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>设置注册居民数变量</name>
+    <type>SetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <field_name>register_number</field_name>
+        <variable_name>register_number</variable_name>
+        <variable_type>PARENT_JOB</variable_type>
+        <default_value/>
+      </field>
+    </fields>
+    <use_formatting>Y</use_formatting>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>1248</xloc>
+      <yloc>464</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>

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

@@ -553,7 +553,7 @@
 )
 VALUES
 	(
-		${commId}, '${commName}', ${gridId}, '${communityGrid}', ${person_num}, ${register_num}, ${case_num}, ${project_num_now}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${register_party_num}, ${close_case_num}, ${finish_project_num}, '${grid_master}', ${sort}, NOW(), null
+		${commId}, '${commName}', ${gridId}, '${communityGrid}', ${person_num}, ${register_number}, ${case_num}, ${project_num_now}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${register_party_num}, ${close_case_num}, ${finish_project_num}, '${grid_master}', ${sort}, NOW(), null
 	)</sql>
     <set_params>N</set_params>
     <insert_field/>

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

@@ -468,6 +468,7 @@
       <attributes/>
       <script>parent_job.setVariable("case_num",0);
 parent_job.setVariable("register_num",0);
+parent_job.setVariable("register_number",0);
 parent_job.setVariable("project_num_now",0);
 parent_job.setVariable("project_num_month",0);
 parent_job.setVariable("topic_num_month",0);