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 20f0913..6920306 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 @@ -1312,6 +1312,12 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set('${commId}', n.ALL_DEPT_IDS) +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); 0 @@ -1321,62 +1327,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_news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新增新闻数 + new_news_num + ####0;-####0 . - + , none N @@ -1422,6 +1382,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${commId}', n.ALL_DEPT_IDS); 0 @@ -1431,62 +1397,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 + news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新闻数 + news_num + ####0;-####0 . - + , none N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all.ktr index fd89fda..7f5f98c 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all.ktr @@ -1085,6 +1085,12 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set('${commId}', n.ALL_DEPT_IDS) +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 0 @@ -1196,6 +1202,12 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set('${commId}', n.ALL_DEPT_IDS) +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all_day.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all_day.ktr index bbb0a09..c60eabf 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all_day.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_all_day.ktr @@ -1086,7 +1086,12 @@ WHERE n.DEL_FLAG = '0' AND find_in_set('${commId}', n.ALL_DEPT_IDS) AND n.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) - +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL ${dayIndex}+1 DAY); 0 @@ -1197,6 +1202,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${commId}', n.ALL_DEPT_IDS) AND n.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 0 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 82bbfcb..b19eb2c 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 @@ -647,6 +647,12 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set('${commId}', n.ALL_DEPT_IDS) +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 @@ -656,62 +662,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_news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新增新闻数 + new_news_num + ####0;-####0 . - + , none N @@ -757,6 +717,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${commId}', n.ALL_DEPT_IDS); 0 @@ -766,62 +732,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 + news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新闻数 + news_num + ####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 c210a1b..bb62036 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 @@ -1292,6 +1292,12 @@ FROM WHERE u.DEL_FLAG = '0' AND u.PARTY_FLAG = '1' +AND u.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND YEAR (u.CREATED_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 @@ -1427,6 +1433,12 @@ FROM WHERE u.DEL_FLAG = '0' AND u.PARTY_FLAG = '0' +AND u.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND YEAR (u.REGISTER_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 @@ -1932,6 +1944,12 @@ FROM WHERE u.DEL_FLAG = '0' AND u.PARTY_FLAG = '1' +AND u.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 @@ -2067,6 +2085,12 @@ FROM WHERE u.DEL_FLAG = '0' AND u.PARTY_FLAG = '0' +AND u.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all.ktr index 585009d..30409e4 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all.ktr @@ -1084,6 +1084,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${streetId}', n.ALL_DEPT_IDS) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 0 @@ -1195,6 +1201,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${streetId}', n.ALL_DEPT_IDS) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all_dayy.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all_dayy.ktr index 89a5f2f..595848b 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all_dayy.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_all_dayy.ktr @@ -1086,7 +1086,12 @@ WHERE n.DEL_FLAG = '0' AND find_in_set('${streetId}', n.ALL_DEPT_IDS) AND n.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) - +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL ${dayIndex}+1 DAY); 0 @@ -1197,6 +1202,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${streetId}', n.ALL_DEPT_IDS) AND n.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr index a2db165..dca9227 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_month.ktr @@ -787,6 +787,12 @@ FROM WHERE n.DEL_FLAG = '0' AND find_in_set('${streetId}', n.ALL_DEPT_IDS) +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND DATE_FORMAT(n.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') 0 @@ -796,62 +802,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_news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新增新闻数 + new_news_num + ####0;-####0 . - + , none N @@ -897,6 +857,12 @@ FROM epdc_news n WHERE n.DEL_FLAG = '0' +AND n.dept_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 + ) AND find_in_set('${streetId}', n.ALL_DEPT_IDS); 0 @@ -906,62 +872,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 + news_num + 15 0 - 新闻参与量阅读量点赞量 - like_of_news - ######0.0###################;-######0.0################### + 新闻数 + news_num + ####0;-####0 . - + , none N