diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr index bb62036..d15dbd3 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query.ktr @@ -827,6 +827,11 @@ 设置大屏网格信息变量 Y + + 注册居民数 + 设置注册居民数变量 + Y + 大屏网格信息 @@ -3704,6 +3709,87 @@ AND i.grid_id NOT IN ( Y + + 注册居民数 + TableInput + + Y + + 1 + + none + + + source_ys_user + 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); + 0 + + N + Y + N + N + + + + + + + + + + + 1008 + 464 + Y + + + + 设置注册居民数变量 + SetVariable + + Y + + 1 + + none + + + + + register_number + register_number + PARENT_JOB + + + + Y + + + + + + + + + + 1248 + 464 + Y + + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr index abeac13..cb49984 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr +++ b/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 ) N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb index bb89d70..9f7f6af 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_day.kjb @@ -468,6 +468,7 @@