From d69db09af3daa16f8a1042b4b9e11f1f66c1a120 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 29 Jun 2020 14:12:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AE=AE=E9=A2=98=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=BD=91=E6=A0=BC=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen_totality_comm_query_month.ktr | 390 +----- .../screen_totality_grid_query.ktr | 42 + .../screen_totality_grid_query_month.ktr | 1224 +++++++++-------- .../screen_totality_grid_query_year.ktr | 20 + 4 files changed, 767 insertions(+), 909 deletions(-) diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr index ca91b04..40df7c6 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_month.ktr @@ -867,6 +867,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND ISSUE_STATE ='2' AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') @@ -878,62 +883,16 @@ WHERE 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 + Integer normal - like_of_news - 32 + topic_finish_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 月新增结案议题数 + topic_finish_num + ####0;-####0 . - + , none N @@ -979,6 +938,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.ITEM_STATE = '10' AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') @@ -990,62 +954,16 @@ WHERE N - BigNumber + Integer normal - participate_of_news - 34 + project_finish_num + 15 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### + 月新增结案项目数 + project_finish_num + ####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 @@ -1091,6 +1009,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 @@ -1101,62 +1024,16 @@ WHERE N - BigNumber + Integer normal - participate_of_news - 34 + new_case_num + 15 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### + 月新增议题数 + new_case_num + ####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 @@ -1202,6 +1079,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 @@ -1212,62 +1094,16 @@ WHERE 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 + Integer normal - like_of_news - 32 + new_project_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 月新增项目数 + new_project_num + ####0;-####0 . - + , none N @@ -1313,6 +1149,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 @@ -1322,62 +1163,16 @@ WHERE N - BigNumber + Integer normal - participate_of_news - 34 + case_num + 15 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### + 议题数 + case_num + ####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 @@ -1695,6 +1490,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 @@ -1704,62 +1504,16 @@ WHERE N - BigNumber + Integer normal - participate_of_news - 34 + project_num + 15 0 - 新闻参与量阅读量点赞量 - participate_of_news - ######0.0###################;-######0.0################### + 项目数 + project_num + ####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 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 b793d5f..7d39531 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 @@ -1098,6 +1098,11 @@ FROM WHERE DEL_FLAG = '0' AND ISSUE_STATE = '2' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1209,6 +1214,11 @@ FROM WHERE DEL_FLAG = '0' AND ITEM_STATE = '10' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1588,6 +1598,7 @@ FROM epdc_group WHERE DEL_FLAG = '0' + AND STATE = '10' AND YEAR (CREATED_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1723,6 +1734,11 @@ FROM WHERE DEL_FLAG = '0' AND ITEM_STATE = '10' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1843,6 +1859,11 @@ FROM epdc_issue WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -1856,6 +1877,11 @@ FROM epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -1995,6 +2021,7 @@ FROM epdc_group WHERE DEL_FLAG = '0' + AND STATE = '10' AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -2129,6 +2156,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 @@ -2240,6 +2272,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 @@ -3883,6 +3920,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr index 7b9b3c4..aab5d4b 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_month.ktr @@ -843,6 +843,123 @@ Y + + 上月已办结项目数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + count(id) AS finish_project_num +FROM + epdc_item +WHERE + DEL_FLAG = '0' +AND ITEM_STATE = '10' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) +AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') + AND find_in_set(${gridId}, 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 + + + + + + + + + + + + 272 + 768 + Y + + 上月总议题数项目数 TableInput @@ -870,6 +987,11 @@ FROM epdc_issue WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -883,6 +1005,11 @@ FROM epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -1291,6 +1418,7 @@ FROM epdc_group WHERE DEL_FLAG = '0' + AND STATE = '10' AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1407,6 +1535,122 @@ WHERE Y + + 上月项目数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + COUNT(i.ID) AS project_num +FROM + epdc_item i +WHERE + i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) +AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') + AND find_in_set(${gridId}, 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 + + + + + + + + + + + + 272 + 672 + Y + + 今年总议题数项目数 TableInput @@ -1434,6 +1678,11 @@ FROM epdc_issue WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND YEAR (CREATED_TIME) = YEAR (NOW()) AND GRID_ID = ${gridId} GROUP BY @@ -1447,6 +1696,11 @@ FROM epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND YEAR (CREATED_TIME) = YEAR (NOW()) AND GRID_ID = ${gridId} GROUP BY @@ -1569,7 +1823,7 @@ GROUP BY - 当年用户注册党员数 + 当年已办结项目数 TableInput Y @@ -1579,16 +1833,21 @@ GROUP BY none - source_ys_user + source_ys_events SELECT - COUNT(u.ID) as reg_party_num + count(id) AS finish_project_num FROM - epdc_user u + epdc_item WHERE - u.DEL_FLAG = '0' -AND u.PARTY_FLAG = '1' -AND YEAR (u.CREATED_TIME) = YEAR (NOW()) -AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + DEL_FLAG = '0' +AND ITEM_STATE = '10' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) +AND YEAR (CREATED_TIME) = YEAR (NOW()) + AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 N @@ -1599,11 +1858,11 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); BigNumber normal - topic_num - 42 + participate_of_news + 34 0 - 今年总议题数 - topic_num + 新闻参与量阅读量点赞量 + participate_of_news ######0.0###################;-######0.0################### . @@ -1622,11 +1881,11 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); BigNumber normal - project_num - 41 + read_of_news + 32 0 - 今年总议题数 - project_num + 新闻参与量阅读量点赞量 + read_of_news ######0.0###################;-######0.0################### . @@ -1643,7 +1902,119 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); N - Integer + 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 + + + + + + + + + + + + 784 + 768 + Y + + + + 当年用户注册党员数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.ID) as reg_party_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' +AND u.PARTY_FLAG = '1' +AND YEAR (u.CREATED_TIME) = YEAR (NOW()) +AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + BigNumber + normal + topic_num + 42 + 0 + 今年总议题数 + topic_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + BigNumber + normal + project_num + 41 + 0 + 今年总议题数 + project_num + ######0.0###################;-######0.0################### + . + + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + Integer normal grid_id 15 @@ -1855,6 +2226,7 @@ FROM epdc_group WHERE DEL_FLAG = '0' + AND STATE = '10' AND YEAR (CREATED_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1971,6 +2343,122 @@ WHERE Y + + 当年项目数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + COUNT(i.ID) AS project_num +FROM + epdc_item i +WHERE + i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) +AND YEAR (i.CREATED_TIME) = YEAR (NOW()) + AND find_in_set(${gridId}, 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 + + + + + + + + + + + + 784 + 672 + Y + + 社区ID，社区name TableInput @@ -2114,7 +2602,7 @@ AND del_flag = '0' - 设置上月总议题数项目数变量 + 设置上月已办结项目数 SetVariable Y @@ -2126,26 +2614,8 @@ AND del_flag = '0' - cal_date - cal_date - PARENT_JOB - - - - grid_id - grid_id - PARENT_JOB - - - - project_num - project_num - PARENT_JOB - - - - topic_num - topic_num + finish_project_num + finish_project_num PARENT_JOB @@ -2161,12 +2631,12 @@ AND del_flag = '0' 512 - 112 + 768 Y - 设置上月用户注册党员数 + 设置上月总议题数项目数变量 SetVariable Y @@ -2178,8 +2648,60 @@ AND del_flag = '0' - reg_party_num - reg_party_num + cal_date + cal_date + PARENT_JOB + + + + grid_id + grid_id + PARENT_JOB + + + + project_num + project_num + PARENT_JOB + + + + topic_num + topic_num + PARENT_JOB + + + + Y + + + + + + + + + + 512 + 112 + Y + + + + 设置上月用户注册党员数 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num + reg_party_num PARENT_JOB @@ -2301,6 +2823,40 @@ AND del_flag = '0' Y + + 设置上月项目数变量 + SetVariable + + Y + + 1 + + none + + + + + project_num + project_num + PARENT_JOB + + + + Y + + + + + + + + + + 512 + 672 + Y + + 设置今年总议题数项目数 SetVariable @@ -2638,7 +3194,7 @@ AND del_flag = '0' - 设置当年用户注册党员数 + 设置当年已办结项目数 SetVariable Y @@ -2650,8 +3206,8 @@ AND del_flag = '0' - reg_party_num - reg_party_num_year + finish_project_num + finish_project_num_year PARENT_JOB @@ -2666,13 +3222,13 @@ AND del_flag = '0' - 1168 - 448 + 1024 + 768 Y - 设置当年用户注册社群数 + 设置当年用户注册党员数 SetVariable Y @@ -2684,8 +3240,8 @@ AND del_flag = '0' - reg_group_num - reg_group_num_year + reg_party_num + reg_party_num_year PARENT_JOB @@ -2701,12 +3257,12 @@ AND del_flag = '0' 1168 - 560 + 448 Y - 设置社区ID，社区name + 设置当年用户注册社群数 SetVariable Y @@ -2718,14 +3274,8 @@ AND del_flag = '0' - commId - commId - PARENT_JOB - - - - commName - commName + reg_group_num + reg_group_num_year PARENT_JOB @@ -2740,13 +3290,13 @@ AND del_flag = '0' - 512 - 224 + 1168 + 560 Y - 设置上月项目数变量 + 设置当年项目数变量 SetVariable Y @@ -2759,7 +3309,7 @@ AND del_flag = '0' project_num - project_num + project_num_year PARENT_JOB @@ -2774,14 +3324,14 @@ AND del_flag = '0' - 512 + 1024 672 Y - 上月项目数 - TableInput + 设置社区ID，社区name + SetVariable Y @@ -2790,238 +3340,21 @@ AND del_flag = '0' none - source_ys_events - SELECT - COUNT(i.ID) AS project_num -FROM - epdc_item i -WHERE - i.DEL_FLAG = '0' -AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') - AND find_in_set(${gridId}, 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 - - - - - - - - - - - - 272 - 672 - Y - - - - 上月已办结项目数 - TableInput - - Y - - 1 - - none - - - source_ys_events - SELECT - count(id) AS finish_project_num -FROM - epdc_item -WHERE - DEL_FLAG = '0' -AND ITEM_STATE = '10' -AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') - AND find_in_set(${gridId}, 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 - - - - - - - - - - - - 272 - 768 - Y - - - - 设置上月已办结项目数 - SetVariable - - Y - - 1 - - none - - - - - finish_project_num - finish_project_num - PARENT_JOB - - - - Y + + + commId + commId + PARENT_JOB + + + + commName + commName + PARENT_JOB + + + + Y @@ -3032,298 +3365,7 @@ AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 512 - 768 - Y - - - - 设置当年项目数变量 - SetVariable - - Y - - 1 - - none - - - - - project_num - project_num_year - PARENT_JOB - - - - Y - - - - - - - - - - 1024 - 672 - Y - - - - 当年项目数 - TableInput - - Y - - 1 - - none - - - source_ys_events - SELECT - COUNT(i.ID) AS project_num -FROM - epdc_item i -WHERE - i.DEL_FLAG = '0' -AND YEAR (i.CREATED_TIME) = YEAR (NOW()) - AND find_in_set(${gridId}, 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 - - - - - - - - - - - - 784 - 672 - Y - - - - 当年已办结项目数 - TableInput - - Y - - 1 - - none - - - source_ys_events - SELECT - count(id) AS finish_project_num -FROM - epdc_item -WHERE - DEL_FLAG = '0' -AND ITEM_STATE = '10' -AND YEAR (CREATED_TIME) = YEAR (NOW()) - AND find_in_set(${gridId}, 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 - - - - - - - - - - - - 784 - 768 - Y - - - - 设置当年已办结项目数 - SetVariable - - Y - - 1 - - none - - - - - finish_project_num - finish_project_num_year - PARENT_JOB - - - - Y - - - - - - - - - - 1024 - 768 + 224 Y diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr index 0c316b0..a8e1be9 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_year.ktr @@ -812,6 +812,11 @@ FROM WHERE DEL_FLAG = '0' AND ITEM_STATE = '10' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND YEAR (CREATED_TIME) = YEAR ( date_sub(now(), INTERVAL 1 YEAR) ) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -932,6 +937,11 @@ FROM epdc_issue WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) AND GRID_ID = ${gridId} @@ -946,6 +956,11 @@ AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) AND GRID_ID = ${gridId} @@ -1493,6 +1508,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND YEAR (i.CREATED_TIME) = YEAR ( date_sub(now(), INTERVAL 1 YEAR) ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0