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 372c454..b793d5f 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 @@ -887,6 +887,7 @@ focus_groups_num, person_num, party_num, + sort, grid_master AS gridmaster FROM epdc_screen_dept_info @@ -3216,6 +3217,12 @@ AND u.dept_id = ${gridId}; PARENT_JOB + + sort + sort + PARENT_JOB + + Y @@ -3232,6 +3239,82 @@ AND u.dept_id = ${gridId}; Y + + 设置大屏网格信息变量 2 + SetVariable + + Y + + 1 + + none + + + + + village_num + village_num + PARENT_JOB + 0 + + + building_num + building_num + PARENT_JOB + 0 + + + housemaster_num + housemaster_num + PARENT_JOB + 0 + + + focus_groups_num + focus_groups_num + PARENT_JOB + 0 + + + person_num + person_num + PARENT_JOB + 0 + + + party_num + party_num + PARENT_JOB + 0 + + + gridmaster + gridmaster + PARENT_JOB + 0 + + + sort + sort + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 736 + Y + + 设置已关闭议题数 SetVariable @@ -3892,76 +3975,6 @@ WHERE Y - - 设置大屏网格信息变量 2 - SetVariable - - Y - - 1 - - none - - - - - village_num - village_num - PARENT_JOB - 0 - - - building_num - building_num - PARENT_JOB - 0 - - - housemaster_num - housemaster_num - PARENT_JOB - 0 - - - focus_groups_num - focus_groups_num - PARENT_JOB - 0 - - - person_num - person_num - PARENT_JOB - 0 - - - party_num - party_num - PARENT_JOB - 0 - - - gridmaster - gridmaster - PARENT_JOB - 0 - - - Y - - - - - - - - - - 784 - 736 - 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 ad8a664..46fb323 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 @@ -546,12 +546,13 @@ close_case_num, finish_project_num, gridmaster, + sort, create_time, update_time ) VALUES ( - ${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', NOW(), null + ${commId}, '${commName}', ${gridId}, '${communityGrid}', ${register_num}, ${case_num}, ${project_num}, ${village_num}, ${building_num}, ${housemaster_num}, ${focus_groups_num}, ${party_num}, ${reg_party_num}, ${close_case_num}, ${finish_project_num}, '${gridmaster}', ${sort}, NOW(), null ) N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month_all_grid.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month_all_grid.kjb index 04f925f..dd4248f 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month_all_grid.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_month_all_grid.kjb @@ -321,7 +321,7 @@ N Y 0 - 240 + 368 320 @@ -359,7 +359,7 @@ N Y 0 - 704 + 624 320 @@ -423,504 +423,6 @@ 320 - - 检验字段的值 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第一网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 128 - - - - 检验字段的值 2 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第二网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 208 - - - - 检验字段的值 3 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第三网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 288 - - - - 检验字段的值 4 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第四网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 368 - - - - 检验字段的值 5 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第五网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 448 - - - - 检验字段的值 6 - - SIMPLE_EVAL - - variable - - ${communityGrid} - string - - 第六网格 - - - contains - equal - false - N - N - Y - 0 - 384 - 528 - - - - 设置变量 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 1 - CURRENT_JOB - - - building_num - 8 - CURRENT_JOB - - - housemaster_num - 7 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 100 - CURRENT_JOB - - - gridmaster - 赵泽诗 - CURRENT_JOB - - - N - Y - 0 - 528 - 128 - - - - 设置变量 2 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 6 - CURRENT_JOB - - - building_num - 11 - CURRENT_JOB - - - housemaster_num - 8 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 113 - CURRENT_JOB - - - gridmaster - 刘东军 - CURRENT_JOB - - - N - Y - 0 - 528 - 208 - - - - 设置变量 3 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 2 - CURRENT_JOB - - - building_num - 8 - CURRENT_JOB - - - housemaster_num - 8 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 41 - CURRENT_JOB - - - gridmaster - 孔凡代 - CURRENT_JOB - - - N - Y - 0 - 528 - 288 - - - - 设置变量 4 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 1 - CURRENT_JOB - - - building_num - 10 - CURRENT_JOB - - - housemaster_num - 7 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 174 - CURRENT_JOB - - - gridmaster - 朱向阳 - CURRENT_JOB - - - N - Y - 0 - 528 - 368 - - - - 设置变量 5 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 0 - CURRENT_JOB - - - building_num - 0 - CURRENT_JOB - - - housemaster_num - 2 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 0 - CURRENT_JOB - - - gridmaster - 李玉锋 - CURRENT_JOB - - - N - Y - 0 - 528 - 448 - - - - 设置变量 6 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - village_num - 1 - CURRENT_JOB - - - building_num - 16 - CURRENT_JOB - - - housemaster_num - 6 - CURRENT_JOB - - - focus_groups_num - -1 - CURRENT_JOB - - - party_num - 18 - CURRENT_JOB - - - gridmaster - 王坤 - CURRENT_JOB - - - N - Y - 0 - 528 - 528 - - - - 成功 - - SUCCESS - - N - Y - 0 - 464 - 80 - - - - 成功 2 - - SUCCESS - - N - Y - 0 - 464 - 160 - - - - 成功 3 - - SUCCESS - - N - Y - 0 - 464 - 240 - - - - 成功 4 - - SUCCESS - - N - Y - 0 - 464 - 320 - - - - 成功 5 - - SUCCESS - - N - Y - 0 - 464 - 400 - - - - 成功 6 - - SUCCESS - - N - Y - 0 - 464 - 480 - - @@ -943,60 +445,6 @@ 网格ID,NAME - 检验字段的值 2 - 0 - 0 - Y - Y - N - - - 网格ID,NAME - 检验字段的值 3 - 0 - 0 - Y - Y - N - - - 网格ID,NAME - 检验字段的值 4 - 0 - 0 - Y - Y - N - - - 网格ID,NAME - 检验字段的值 5 - 0 - 0 - Y - Y - N - - - 网格ID,NAME - 检验字段的值 6 - 0 - 0 - Y - Y - N - - - 检验字段的值 - 设置变量 - 0 - 0 - Y - Y - N - - - 设置变量 获取网格信息变量 0 0 @@ -1004,159 +452,6 @@ Y N - - 检验字段的值 2 - 设置变量 2 - 0 - 0 - Y - Y - N - - - 检验字段的值 3 - 设置变量 3 - 0 - 0 - Y - Y - N - - - 检验字段的值 4 - 设置变量 4 - 0 - 0 - Y - Y - N - - - 检验字段的值 5 - 设置变量 5 - 0 - 0 - Y - Y - N - - - 检验字段的值 6 - 设置变量 6 - 0 - 0 - Y - Y - N - - - 设置变量 2 - 获取网格信息变量 - 0 - 0 - Y - Y - N - - - 设置变量 3 - 获取网格信息变量 - 0 - 0 - Y - Y - N - - - 设置变量 4 - 获取网格信息变量 - 0 - 0 - Y - Y - N - - - 设置变量 5 - 获取网格信息变量 - 0 - 0 - Y - Y - N - - - 设置变量 6 - 获取网格信息变量 - 0 - 0 - Y - Y - N - - - 检验字段的值 - 成功 - 0 - 0 - Y - N - N - - - 检验字段的值 2 - 成功 2 - 0 - 0 - Y - N - N - - - 检验字段的值 3 - 成功 3 - 0 - 0 - Y - N - N - - - 检验字段的值 4 - 成功 4 - 0 - 0 - Y - N - N - - - 检验字段的值 5 - 成功 5 - 0 - 0 - Y - N - N - - - 检验字段的值 6 - 成功 6 - 0 - 0 - Y - N - N - - - 网格ID,NAME - 检验字段的值 - 0 - 0 - Y - Y - N -