diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr index 427366b..4611b37 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update.ktr @@ -950,6 +950,94 @@ Y + + 写入议题项目分类表 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} + ys_classify
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 464 + 752 + Y + + + + 写入议题项目分类表-年 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} + ys_classify
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 944 + 752 + Y + + 字段选择 SelectValues @@ -1256,6 +1344,104 @@ Y + + 字段选择 3 2 2 + SelectValues + + Y + + 1 + + none + + + + + classfy_id + + + classfy_name + + + comm_id + + + comm_name + + + topic_num + + + project_num + + + cal_date + + N + + + + + + + + + + + 304 + 752 + Y + + + + 字段选择 3 2 2 2 + SelectValues + + Y + + 1 + + none + + + + + classfy_id + + + classfy_name + + + comm_id + + + comm_name + + + topic_num + + + project_num + + + cal_date + + N + + + + + + + + + + + 784 + 752 + Y + + 更新新闻资讯 TableOutput @@ -1867,7 +2053,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE pp.DEL_FLAG = '0' AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND YEAR (es.CREATED_TIME) = YEAR (NOW()) + AND YEAR (pp.CREATED_TIME) = YEAR (NOW()) GROUP BY pp.id; 0 @@ -2370,7 +2556,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE pp.DEL_FLAG = '0' AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') + AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') GROUP BY pp.id; 0 @@ -2394,99 +2580,6 @@ GROUP BY Y - - 写入议题项目分类表 - TableOutput - - Y - - 1 - - none - - - target_yushan - ${db.mysql.target.schema.yushandb} - ys_classify
- 1000 - N - N - Y - N - N - - N - Y - N - - Y - N - - - - - - - - - - - - - 464 - 752 - Y - - - - 字段选择 3 2 2 - SelectValues - - Y - - 1 - - none - - - - - classfy_id - - - classfy_name - - - comm_id - - - comm_name - - - topic_num - - - project_num - - - cal_date - - N - - - - - - - - - - - 304 - 752 - Y - - 统计议题项目分类表 TableInput @@ -2568,99 +2661,6 @@ GROUP BY Y - - 写入议题项目分类表-年 - TableOutput - - Y - - 1 - - none - - - target_yushan - ${db.mysql.target.schema.yushandb} - ys_classify
- 1000 - N - N - Y - N - N - - N - Y - N - - Y - N - - - - - - - - - - - - - 944 - 752 - Y - - - - 字段选择 3 2 2 2 - SelectValues - - Y - - 1 - - none - - - - - classfy_id - - - classfy_name - - - comm_id - - - comm_name - - - topic_num - - - project_num - - - cal_date - - N - - - - - - - - - - - 784 - 752 - Y - - 统计议题项目分类表-年 TableInput diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr index b932b81..48eaf5f 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day.ktr @@ -1228,7 +1228,7 @@ FROM epdc_events WHERE DEL_FLAG = '0' -AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') AND find_in_set(${commId}, ALL_DEPT_IDS) ORDER BY COMMENT_NUM DESC @@ -1473,7 +1473,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE pp.DEL_FLAG = '0' AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') + AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') GROUP BY pp.id; 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr index ef6225e..310fd57 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_day_all.ktr @@ -1473,7 +1473,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE pp.DEL_FLAG = '0' AND find_in_set(${commId}, pp.ALL_DEPT_IDS) -AND DATE_FORMAT(es.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') +AND DATE_FORMAT(pp.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') GROUP BY pp.id; 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr index aec288b..df7c739 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_commu_hot_topic_update_year.ktr @@ -910,6 +910,50 @@ Y + + 写入议题项目分类表-年 + TableOutput + + Y + + 1 + + none + + + target_yushan + ${db.mysql.target.schema.yushandb} + ys_classify
+ 1000 + N + N + Y + N + N + + N + Y + N + + Y + N + + + + + + + + + + + + + 752 + 544 + Y + + 字段选择 SelectValues @@ -1063,6 +1107,55 @@ Y + + 字段选择 3 2 2 2 + SelectValues + + Y + + 1 + + none + + + + + classfy_id + + + classfy_name + + + comm_id + + + comm_name + + + topic_num + + + project_num + + + cal_date + + N + + + + + + + + + + + 592 + 544 + Y + + 统计新闻资讯 TableInput @@ -1382,7 +1475,7 @@ LEFT JOIN epdc_property_project pp ON pp.id = es.PROJECT_ID WHERE pp.DEL_FLAG = '0' AND find_in_set(${commId}, pp.ALL_DEPT_IDS) - AND es.CREATED_TIME BETWEEN STR_TO_DATE( CONCAT( YEAR ( NOW())- 1, '-01-01' ), '%Y-%m-%d' ) + AND pp.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' ) GROUP BY pp.id; @@ -1407,99 +1500,6 @@ GROUP BY Y - - 写入议题项目分类表-年 - TableOutput - - Y - - 1 - - none - - - target_yushan - ${db.mysql.target.schema.yushandb} - ys_classify
- 1000 - N - N - Y - N - N - - N - Y - N - - Y - N - - - - - - - - - - - - - 752 - 544 - Y - - - - 字段选择 3 2 2 2 - SelectValues - - Y - - 1 - - none - - - - - classfy_id - - - classfy_name - - - comm_id - - - comm_name - - - topic_num - - - project_num - - - cal_date - - N - - - - - - - - - - - 592 - 544 - Y - - 统计议题项目分类表-年 TableInput diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb index ac5552b..28bcd52 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_all.kjb @@ -935,8 +935,156 @@ true; N Y 0 - 464 - 272 + 640 + 320 + + + + 日期下标 + + SET_VARIABLES + + Y + + CURRENT_JOB + + + monthIndex + 0 + CURRENT_JOB + + + months + 3 + CURRENT_JOB + + + dayIndex + 0 + CURRENT_JOB + + + days + 30 + CURRENT_JOB + + + N + Y + 0 + 368 + 320 + + + + 日期下标 2 + + SET_VARIABLES + + Y + + CURRENT_JOB + + + monthIndex + 0 + CURRENT_JOB + + + months + 3 + CURRENT_JOB + + + dayIndex + 0 + CURRENT_JOB + + + days + 30 + CURRENT_JOB + + + N + Y + 0 + 368 + 432 + + + + 日期下标 3 + + SET_VARIABLES + + Y + + CURRENT_JOB + + + monthIndex + 0 + CURRENT_JOB + + + months + 3 + CURRENT_JOB + + + dayIndex + 0 + CURRENT_JOB + + + days + 30 + CURRENT_JOB + + + N + Y + 0 + 368 + 656 + + + + 日期下标 4 + + SET_VARIABLES + + Y + + CURRENT_JOB + + + monthIndex + 0 + CURRENT_JOB + + + months + 3 + CURRENT_JOB + + + dayIndex + 0 + CURRENT_JOB + + + days + 30 + CURRENT_JOB + + + N + Y + 0 + 368 + 912 @@ -995,15 +1143,6 @@ true; Y Y - - 清空表 - 网格下标 - 0 - 0 - Y - Y - N - if(numberOfGrid>gridIndex) 网格操作 @@ -1022,15 +1161,6 @@ true; Y N - - 清空表 - 街道下标 - 0 - 0 - Y - Y - N - 街道下标 街道数 @@ -1094,15 +1224,6 @@ true; N N - - 清空表 - 社区下标 - 0 - 0 - Y - Y - N - 社区下标 社区数 @@ -1168,6 +1289,15 @@ true; 清空表 + 日期下标 + 0 + 0 + Y + Y + N + + + 日期下标 公益互助 0 0 @@ -1175,6 +1305,60 @@ true; Y N + + 清空表 + 日期下标 2 + 0 + 0 + Y + Y + N + + + 日期下标 2 + 网格下标 + 0 + 0 + Y + Y + N + + + 清空表 + 日期下标 3 + 0 + 0 + Y + Y + N + + + 清空表 + 日期下标 4 + 0 + 0 + Y + Y + N + + + 日期下标 3 + 街道下标 + 0 + 0 + Y + Y + N + + + 日期下标 4 + 社区下标 + 0 + 0 + Y + Y + N + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb index c518cd4..8be103b 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_comm_day_all.kjb @@ -309,33 +309,6 @@ 224 - - 天数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - dayIndex - 0 - CURRENT_JOB - - - days - 30 - CURRENT_JOB - - - N - Y - 0 - 368 - 368 - - if(dayIndex<days) @@ -356,8 +329,8 @@ N Y 0 - 752 - 368 + 528 + 384 @@ -393,8 +366,8 @@ N Y 0 - 976 - 496 + 752 + 512 @@ -411,8 +384,8 @@ true; N Y 0 - 752 - 496 + 528 + 512 @@ -423,35 +396,8 @@ true; N Y 0 - 976 - 368 - - - - 月数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - monthIndex - 0 - CURRENT_JOB - - - months - 3 - CURRENT_JOB - - - N - Y - 0 - 368 - 80 + 752 + 384 @@ -474,8 +420,8 @@ true; N Y 0 - 752 - 80 + 528 + 96 @@ -511,8 +457,8 @@ true; N Y 0 - 976 - 208 + 752 + 224 @@ -529,8 +475,8 @@ true; N Y 0 - 752 - 208 + 528 + 224 @@ -541,21 +487,12 @@ true; N Y 0 - 976 - 80 + 752 + 96 - - Start - 天数下标 - 0 - 0 - N - Y - Y - 社区操作 day下标加一，处理下个day @@ -574,15 +511,6 @@ true; Y N - - 天数下标 - if(dayIndex<days) - 0 - 0 - Y - Y - N - if(dayIndex<days) 社区操作 @@ -602,17 +530,17 @@ true; N - Start - 月数下标 + if(monthIndex<months) 2 + 社区操作 2 0 0 Y Y - Y + N - 月数下标 - if(monthIndex<months) 2 + 社区操作 2 + month下标加一，处理下个month 0 0 Y @@ -620,8 +548,8 @@ true; N - if(monthIndex<months) 2 - 社区操作 2 + month下标加一，处理下个month + if(monthIndex<months) 2 0 0 Y @@ -629,31 +557,31 @@ true; N - 社区操作 2 - month下标加一，处理下个month + if(monthIndex<months) 2 + 成功 2 0 0 Y - Y + N N - month下标加一，处理下个month + Start if(monthIndex<months) 2 0 0 Y Y - N + Y - if(monthIndex<months) 2 - 成功 2 + Start + if(dayIndex<days) 0 0 Y - N - N + Y + Y diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb index c82ba7a..fef73bb 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_grid_all_day.kjb @@ -309,33 +309,6 @@ 224 - - 月数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - monthIndex - 0 - CURRENT_JOB - - - months - 3 - CURRENT_JOB - - - N - Y - 0 - 368 - 80 - - if(monthIndex<months) 2 @@ -356,7 +329,7 @@ N Y 0 - 752 + 512 80 @@ -393,7 +366,7 @@ N Y 0 - 976 + 736 208 @@ -411,7 +384,7 @@ true; N Y 0 - 752 + 512 208 @@ -423,30 +396,12 @@ true; N Y 0 - 976 + 736 80 - - Start - 月数下标 - 0 - 0 - Y - Y - Y - - - 月数下标 - if(monthIndex<months) 2 - 0 - 0 - Y - Y - N - if(monthIndex<months) 2 网格操作 2 @@ -483,6 +438,15 @@ true; N N + + Start + if(monthIndex<months) 2 + 0 + 0 + Y + Y + Y + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb index 6cd1694..c187ad2 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_null_all_day.kjb @@ -305,153 +305,8 @@ N Y 0 - 96 - 224 - - - - 天数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - dayIndex - 0 - CURRENT_JOB - - - days - 30 - CURRENT_JOB - - - N - Y - 0 - 368 - 368 - - - - if(dayIndex<days) - - SIMPLE_EVAL - - variable - - ${dayIndex} - number - - ${days} - - - equal - smaller - false - N - N - Y - 0 - 752 - 368 - - - - 日操作 - - JOB - - filename - - ${Internal.Entry.Current.Directory}/yushan_street_day_all_street.kjb - - - N - N - N - N - - - N - N - Nothing - - Y - N - N - N - N - Pentaho local - - Y - - N - N - Y - 0 - 976 - 496 - - - - day下标加一，处理下个day - - EVAL - - - N - Y - 0 - 752 - 496 - - - - 成功 - - SUCCESS - - N - Y - 0 - 976 - 368 - - - - 月数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - monthIndex - 0 - CURRENT_JOB - - - months - 3 - CURRENT_JOB - - - N - Y - 0 - 368 - 80 + 224 + 256 @@ -474,8 +329,8 @@ true; N Y 0 - 752 - 80 + 592 + 256 @@ -511,8 +366,8 @@ true; N Y 0 - 976 - 208 + 816 + 384 @@ -529,8 +384,8 @@ true; N Y 0 - 752 - 208 + 592 + 384 @@ -541,84 +396,12 @@ true; N Y 0 - 976 - 80 + 816 + 256 - - Start - 天数下标 - 0 - 0 - N - Y - Y - - - 日操作 - day下标加一，处理下个day - 0 - 0 - Y - Y - N - - - day下标加一，处理下个day - if(dayIndex<days) - 0 - 0 - Y - Y - N - - - 天数下标 - if(dayIndex<days) - 0 - 0 - Y - Y - N - - - if(dayIndex<days) - 日操作 - 0 - 0 - Y - Y - N - - - if(dayIndex<days) - 成功 - 0 - 0 - Y - N - N - - - Start - 月数下标 - 0 - 0 - Y - Y - Y - - - 月数下标 - if(monthIndex<months) 2 - 0 - 0 - Y - Y - N - if(monthIndex<months) 2 月操作 @@ -655,6 +438,15 @@ true; N N + + Start + if(monthIndex<months) 2 + 0 + 0 + Y + Y + Y + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb index be364ae..6229e71 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_all_day.kjb @@ -309,33 +309,6 @@ 224 - - 天数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - dayIndex - 0 - CURRENT_JOB - - - days - 30 - CURRENT_JOB - - - N - Y - 0 - 368 - 368 - - if(dayIndex<days) @@ -356,8 +329,8 @@ N Y 0 - 752 - 368 + 464 + 400 @@ -393,8 +366,8 @@ N Y 0 - 976 - 496 + 688 + 528 @@ -411,8 +384,8 @@ true; N Y 0 - 752 - 496 + 464 + 528 @@ -423,35 +396,8 @@ true; N Y 0 - 976 - 368 - - - - 月数下标 - - SET_VARIABLES - - Y - - CURRENT_JOB - - - monthIndex - 0 - CURRENT_JOB - - - months - 3 - CURRENT_JOB - - - N - Y - 0 - 368 - 80 + 688 + 400 @@ -474,8 +420,8 @@ true; N Y 0 - 752 - 80 + 464 + 112 @@ -511,8 +457,8 @@ true; N Y 0 - 976 - 208 + 688 + 240 @@ -529,8 +475,8 @@ true; N Y 0 - 752 - 208 + 464 + 240 @@ -541,21 +487,12 @@ true; N Y 0 - 976 - 80 + 688 + 112 - - Start - 天数下标 - 0 - 0 - N - Y - Y - 街道操作 day下标加一，处理下个day @@ -574,15 +511,6 @@ true; Y N - - 天数下标 - if(dayIndex<days) - 0 - 0 - Y - Y - N - if(dayIndex<days) 街道操作 @@ -602,17 +530,17 @@ true; N - Start - 月数下标 + if(monthIndex<months) 2 + 街道操作 2 0 0 Y Y - Y + N - 月数下标 - if(monthIndex<months) 2 + 街道操作 2 + month下标加一，处理下个month 0 0 Y @@ -620,8 +548,8 @@ true; N - if(monthIndex<months) 2 - 街道操作 2 + month下标加一，处理下个month + if(monthIndex<months) 2 0 0 Y @@ -629,31 +557,31 @@ true; N - 街道操作 2 - month下标加一，处理下个month + if(monthIndex<months) 2 + 成功 2 0 0 Y - Y + N N - month下标加一，处理下个month + Start if(monthIndex<months) 2 0 0 Y Y - N + Y - if(monthIndex<months) 2 - 成功 2 + Start + if(dayIndex<days) 0 0 Y - N - N + Y + Y