diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr index ae40749..d03a640 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query.ktr @@ -902,6 +902,11 @@ 设置月新增项目数变量 Y + + 大屏街道信息 + 设置大屏街道信息变量 + Y + 党员数 @@ -1746,7 +1751,7 @@ WHERE - 注册用户数 + 月新增结案议题数 TableInput Y @@ -1756,31 +1761,80 @@ WHERE none - source_ys_user + source_ys_events SELECT - COUNT(u.id) user_all + COUNT(i.ID) AS topic_finish_num FROM - epdc_user u + epdc_issue i WHERE - u.DEL_FLAG = '0'; + i.DEL_FLAG = '0' + AND ISSUE_STATE ='2' + AND find_in_set('${commId}', i.ALL_DEPT_IDS) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N - N + Y N N - Integer + BigNumber normal - user_all - 15 + participate_of_news + 34 0 - 注册用户数 - user_all - ####0;-####0 + 新闻参与量阅读量点赞量 + participate_of_news + ######0.0###################;-######0.0################### . - , + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + read_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + read_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + like_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + like_of_news + ######0.0###################;-######0.0################### + . + none N @@ -1803,13 +1857,13 @@ WHERE - 208 + 1072 256 Y - 网格数 + 月新增结案项目数 TableInput Y @@ -1819,18 +1873,16 @@ WHERE none - source_ys_admin + source_ys_events SELECT - COUNT(id) grid_num + COUNT(i.ID) AS project_finish_num FROM - sys_dept + epdc_item i WHERE - type_key = 'grid_party' -AND del_flag = 0 -AND find_in_set('${commId}', pids) -ORDER BY - create_date ASC, - id ASC; + i.DEL_FLAG = '0' + AND i.ITEM_STATE = '10' + AND find_in_set('${commId}', i.ALL_DEPT_IDS) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -1839,16 +1891,62 @@ ORDER BY N - Integer + BigNumber normal - issue_number - 15 + participate_of_news + 34 0 - 党群总数 2 - issue_number - ####0;-####0 + 新闻参与量阅读量点赞量 + participate_of_news + ######0.0###################;-######0.0################### . - , + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + read_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + read_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + like_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + like_of_news + ######0.0###################;-######0.0################### + . + none N @@ -1871,94 +1969,13 @@ ORDER BY - 208 - 96 - Y - - - - 街道党员数 - TableInput - - Y - - 1 - - none - - - source_ys_user - SELECT - COUNT(u.id) party_member_num -FROM - epdc_user u -WHERE - u.DEL_FLAG = '0' - AND u.PARTY_FLAG = '1' - AND find_in_set('${commId}', u.ALL_DEPT_IDS); - 0 - - N - Y - N - N - - - - - - - - - - - 208 - 656 - Y - - - - 街道用户数 - TableInput - - Y - - 1 - - none - - - source_ys_user - SELECT - COUNT(u.id) user_num -FROM - epdc_user u -WHERE - u.DEL_FLAG = '0' - AND find_in_set('${commId}', u.ALL_DEPT_IDS); - 0 - - N - Y - N - N - - - - - - - - - - - 208 - 336 + 1072 + 496 Y - 议题数 + 月新增议题数 TableInput Y @@ -1970,12 +1987,13 @@ WHERE source_ys_events SELECT - COUNT(i.ID) AS case_num + COUNT(i.ID) AS new_case_num FROM epdc_issue i WHERE i.DEL_FLAG = '0' - AND find_in_set('${commId}', i.ALL_DEPT_IDS); + AND find_in_set('${commId}', i.ALL_DEPT_IDS) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -2062,14 +2080,14 @@ WHERE - 624 - 96 + 1072 + 176 Y - 设置党员数变量 - SetVariable + 月新增项目数 + TableInput Y @@ -2078,15 +2096,92 @@ WHERE none - - - party_member_all - party_member_all - PARENT_JOB - - - - Y + source_ys_events + SELECT + COUNT(i.ID) AS new_project_num +FROM + epdc_item i +WHERE + i.DEL_FLAG = '0' + AND find_in_set('${commId}', i.ALL_DEPT_IDS) + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') + 0 + + N + Y + N + N + + + BigNumber + normal + participate_of_news + 34 + 0 + 新闻参与量阅读量点赞量 + participate_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + read_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + read_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + like_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + like_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + @@ -2096,14 +2191,14 @@ WHERE - 448 - 576 + 1072 + 416 Y - 设置党群数变量 - SetVariable + 注册用户数 + TableInput Y @@ -2112,15 +2207,44 @@ WHERE none - - - party_group_num - party_group_num - PARENT_JOB - - - - Y + source_ys_user + SELECT + COUNT(u.id) user_all +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0'; + 0 + + N + N + N + N + + + Integer + normal + user_all + 15 + 0 + 注册用户数 + user_all + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + @@ -2130,14 +2254,14 @@ WHERE - 448 - 176 + 208 + 256 Y - 设置新增新闻数变量 - SetVariable + 网格数 + TableInput Y @@ -2146,15 +2270,49 @@ WHERE none - - - new_news_num - new_news_num - PARENT_JOB - - - - Y + source_ys_admin + SELECT + COUNT(id) grid_num +FROM + sys_dept +WHERE + type_key = 'grid_party' +AND del_flag = 0 +AND find_in_set('${commId}', pids) +ORDER BY + create_date ASC, + id ASC; + 0 + + N + Y + N + N + + + Integer + normal + issue_number + 15 + 0 + 党群总数 2 + issue_number + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + @@ -2164,14 +2322,14 @@ WHERE - 448 - 496 + 208 + 96 Y - 设置新增议题数变量 - SetVariable + 街道党员数 + TableInput Y @@ -2180,15 +2338,22 @@ WHERE none - - - new_case_num - new_case_num - PARENT_JOB - - - - Y + source_ys_user + SELECT + COUNT(u.id) party_member_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' + AND u.PARTY_FLAG = '1' + AND find_in_set('${commId}', u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + @@ -2198,14 +2363,14 @@ WHERE - 864 - 176 + 208 + 656 Y - 设置新增项目数变量 - SetVariable + 街道用户数 + TableInput Y @@ -2214,10 +2379,160 @@ WHERE none - - - new_project_num - new_project_num + source_ys_user + SELECT + COUNT(u.id) user_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' + AND find_in_set('${commId}', u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + + + + + + + + + 208 + 336 + Y + + + + 议题数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + COUNT(i.ID) AS case_num +FROM + epdc_issue i +WHERE + i.DEL_FLAG = '0' + AND find_in_set('${commId}', i.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + participate_of_news + 34 + 0 + 新闻参与量阅读量点赞量 + participate_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + read_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + read_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + like_of_news + 32 + 0 + 新闻参与量阅读量点赞量 + like_of_news + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 624 + 96 + Y + + + + 设置党员数变量 + SetVariable + + Y + + 1 + + none + + + + + party_member_all + party_member_all PARENT_JOB @@ -2232,13 +2547,13 @@ WHERE - 864 - 416 + 448 + 576 Y - 设置新闻数变量 + 设置党群数变量 SetVariable Y @@ -2250,8 +2565,8 @@ WHERE - news_num - news_num + party_group_num + party_group_num PARENT_JOB @@ -2267,12 +2582,12 @@ WHERE 448 - 416 + 176 Y - 设置日新增结案议题数变量 + 设置新增新闻数变量 SetVariable Y @@ -2284,8 +2599,8 @@ WHERE - topic_finish_num - topic_finish_num + new_news_num + new_news_num PARENT_JOB @@ -2300,13 +2615,13 @@ WHERE - 864 - 256 + 448 + 496 Y - 设置日新增结案项目数变量 + 设置新增议题数变量 SetVariable Y @@ -2318,8 +2633,8 @@ WHERE - project_finish_num - project_finish_num + new_case_num + new_case_num PARENT_JOB @@ -2335,12 +2650,12 @@ WHERE 864 - 496 + 176 Y - 设置注册用户数变量 + 设置新增项目数变量 SetVariable Y @@ -2352,8 +2667,8 @@ WHERE - user_all - user_all + new_project_num + new_project_num PARENT_JOB @@ -2368,13 +2683,13 @@ WHERE - 448 - 256 + 864 + 416 Y - 设置网格数变量 + 设置新闻数变量 SetVariable Y @@ -2386,8 +2701,8 @@ WHERE - grid_num - grid_num + news_num + news_num PARENT_JOB @@ -2403,12 +2718,12 @@ WHERE 448 - 96 + 416 Y - 设置街道党员数变量 + 设置日新增结案议题数变量 SetVariable Y @@ -2420,8 +2735,8 @@ WHERE - party_member_num - party_member_num + topic_finish_num + topic_finish_num PARENT_JOB @@ -2436,13 +2751,13 @@ WHERE - 448 - 656 + 864 + 256 Y - 设置街道用户数变量 + 设置日新增结案项目数变量 SetVariable Y @@ -2454,8 +2769,8 @@ WHERE - user_num - user_num + project_finish_num + project_finish_num PARENT_JOB @@ -2470,13 +2785,13 @@ WHERE - 448 - 336 + 864 + 496 Y - 设置议题数变量 + 设置月新增结案议题数变量 SetVariable Y @@ -2488,8 +2803,8 @@ WHERE - case_num - case_num + topic_finish_num + topic_finish_num_month PARENT_JOB @@ -2504,13 +2819,13 @@ WHERE - 864 - 96 + 1312 + 256 Y - 设置项目数变量 + 设置月新增结案项目数变量 SetVariable Y @@ -2522,8 +2837,8 @@ WHERE - project_num - project_num + project_finish_num + project_finish_num_month PARENT_JOB @@ -2538,14 +2853,14 @@ WHERE - 864 - 336 + 1312 + 496 Y - 项目数 - TableInput + 设置月新增议题数变量 + SetVariable Y @@ -2554,91 +2869,15 @@ WHERE none - source_ys_events - SELECT - COUNT(i.ID) AS project_num -FROM - epdc_item i -WHERE - i.DEL_FLAG = '0' - AND find_in_set('${commId}', i.ALL_DEPT_IDS); - 0 - - N - Y - N - N - - - BigNumber - normal - participate_of_news - 34 - 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - read_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - read_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - like_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - + + + new_case_num + new_case_num_month + PARENT_JOB + + + + Y @@ -2648,14 +2887,14 @@ WHERE - 624 - 336 + 1312 + 176 Y - 月新增结案议题数 - TableInput + 设置月新增项目数变量 + SetVariable Y @@ -2664,93 +2903,15 @@ WHERE none - source_ys_events - SELECT - COUNT(i.ID) AS topic_finish_num -FROM - epdc_issue i -WHERE - i.DEL_FLAG = '0' - AND ISSUE_STATE ='2' - AND find_in_set('${commId}', i.ALL_DEPT_IDS) - AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') - 0 - - N - Y - N - N - - - BigNumber - normal - participate_of_news - 34 - 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - read_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - read_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - like_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - + + + new_project_num + new_project_num_month + PARENT_JOB + + + + Y @@ -2760,14 +2921,48 @@ WHERE - 1072 + 1312 + 416 + Y + + + + 设置注册用户数变量 + SetVariable + + Y + + 1 + + none + + + + + user_all + user_all + PARENT_JOB + + + + Y + + + + + + + + + + 448 256 Y - 月新增议题数 - TableInput + 设置网格数变量 + SetVariable Y @@ -2776,92 +2971,49 @@ WHERE none - source_ys_events - SELECT - COUNT(i.ID) AS new_case_num -FROM - epdc_issue i -WHERE - i.DEL_FLAG = '0' - AND find_in_set('${commId}', i.ALL_DEPT_IDS) - AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') - 0 - - N - Y - N - N - - - BigNumber - normal - participate_of_news - 34 - 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - read_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - read_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - BigNumber - normal - like_of_news - 32 - 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### - . - - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - + + + grid_num + grid_num + PARENT_JOB + + + + Y + + + + + + + + + + 448 + 96 + Y + + + + 设置街道党员数变量 + SetVariable + + Y + + 1 + + none + + + + + party_member_num + party_member_num + PARENT_JOB + + + + Y @@ -2871,13 +3023,13 @@ WHERE - 1072 - 176 + 448 + 656 Y - 设置月新增结案议题数变量 + 设置街道用户数变量 SetVariable Y @@ -2889,8 +3041,8 @@ WHERE - topic_finish_num - topic_finish_num_month + user_num + user_num PARENT_JOB @@ -2905,13 +3057,13 @@ WHERE - 1312 - 256 + 448 + 336 Y - 设置月新增议题数变量 + 设置议题数变量 SetVariable Y @@ -2923,8 +3075,8 @@ WHERE - new_case_num - new_case_num_month + case_num + case_num PARENT_JOB @@ -2939,13 +3091,47 @@ WHERE - 1312 - 176 + 864 + 96 Y - 月新增结案项目数 + 设置项目数变量 + SetVariable + + Y + + 1 + + none + + + + + project_num + project_num + PARENT_JOB + + + + Y + + + + + + + + + + 864 + 336 + Y + + + + 项目数 TableInput Y @@ -2957,14 +3143,12 @@ WHERE source_ys_events SELECT - COUNT(i.ID) AS project_finish_num + COUNT(i.ID) AS project_num FROM epdc_item i WHERE i.DEL_FLAG = '0' - AND i.ITEM_STATE = '10' - AND find_in_set('${commId}', i.ALL_DEPT_IDS) - AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') + AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 N @@ -3051,13 +3235,13 @@ WHERE - 1072 - 496 + 624 + 336 Y - 月新增项目数 + 大屏街道信息 TableInput Y @@ -3067,15 +3251,16 @@ WHERE none - source_ys_events + source_ys_admin SELECT - COUNT(i.ID) AS new_project_num + extend FROM - epdc_item i + epdc_screen_dept_info WHERE - i.DEL_FLAG = '0' - AND find_in_set('${commId}', i.ALL_DEPT_IDS) - AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') + DEL_FLAG = '0' +AND DEPT_ID = ${streetId} +ORDER BY + id ASC 0 N @@ -3084,16 +3269,16 @@ WHERE N - BigNumber + Integer normal - participate_of_news - 34 + village_num + 9 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### + 大屏网格信息 + village_num + ####0;-####0 . - + , none N @@ -3107,16 +3292,16 @@ WHERE N - BigNumber + Integer normal - read_of_news - 32 + building_num + 9 0 - 新闻参与量阅读量点赞量 - read_of_news - ######0.0###################;-######0.0################### + 大屏网格信息 + building_num + ####0;-####0 . - + , none N @@ -3130,16 +3315,108 @@ WHERE N - BigNumber + Integer normal - like_of_news - 32 + housemaster_num + 9 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 大屏网格信息 + housemaster_num + ####0;-####0 . - + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + focus_groups_num + 9 + 0 + 大屏网格信息 + focus_groups_num + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + person_num + 9 + 0 + 大屏网格信息 + person_num + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer + normal + party_num + 9 + 0 + 大屏网格信息 + party_num + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + gridmaster + 32 + -1 + 大屏网格信息 + gridmaster + + . + , none N @@ -3162,47 +3439,13 @@ WHERE - 1072 - 416 - Y - - - - 设置月新增结案项目数变量 - SetVariable - - Y - - 1 - - none - - - - - project_finish_num - project_finish_num_month - PARENT_JOB - - - - Y - - - - - - - - - - 1312 - 496 + 624 + 576 Y - 设置月新增项目数变量 + 设置大屏街道信息变量 SetVariable Y @@ -3214,8 +3457,8 @@ WHERE - new_project_num - new_project_num_month + extend + extend PARENT_JOB @@ -3230,8 +3473,8 @@ WHERE - 1312 - 416 + 864 + 576 Y diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr index 0db503f..a03db24 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_update.ktr +++ b/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}, '榆山街道会仙山社区成立于2015年1月，面积1.7平方公里，管辖玫城丽都、景丰福星园等十二个居民小区，十二个共建单位，十二个社会组织，共有居民2715户，8912人。社区自成立以来，着力打造“睦邻党建”品牌，让社区党建末梢延伸到千家万户，实现类社区空间微更新、社区关系微促进、社区文化再塑造，满足人民群众美好生活期待，夯实党的执政基础。', NOW(), null + ${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 ) N