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 c5b3140..0db503f 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 @@ -602,7 +602,7 @@ VALUES ) VALUES ( - ${commId}, '${commName}', CURDATE(), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null + ${commId}, '${commName}', DATE_SUB(CURDATE(), INTERVAL 1 DAY), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null ) N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr index 5c5a204..e806669 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query.ktr @@ -882,6 +882,26 @@ 设置日新增结案项目数变量 Y + + 月新增结案议题数 + 设置月新增结案议题数变量 + Y + + + 月新增议题数 + 设置月新增议题数变量 + Y + + + 月新增结案项目数 + 设置月新增结案项目数变量 + Y + + + 月新增项目数 + 设置月新增项目数变量 + Y + 党员数 @@ -919,12 +939,454 @@ WHERE 192 - 592 + 592 + Y + + + + 党群数 + TableInput + + Y + + 1 + + none + + + source_ys_group + SELECT + COUNT(g.id) party_group_num +FROM + epdc_group g +WHERE + g.STATE = '10' +AND g.DEL_FLAG = '0' +AND find_in_set(${streetId}, g.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 + + + + + + + + + + + + 192 + 176 + 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(${streetId}, 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 + + + + + + + + + + + + 608 + 96 + 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 find_in_set(${streetId}, 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 + + + + + + + + + + + + 608 + 336 + Y + + + + 新增新闻数 + TableInput + + Y + + 1 + + none + + + source_ys_news + SELECT + COUNT(n.ID) AS new_news_num +FROM + epdc_news n +WHERE + n.DEL_FLAG = '0' + AND find_in_set(${streetId}, n.ALL_DEPT_IDS) + AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + 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 + + + + + + + + + + + + 192 + 496 Y - 党群数 + 新闻数 TableInput Y @@ -934,15 +1396,14 @@ WHERE none - source_ys_group + source_ys_news SELECT - COUNT(g.id) party_group_num + COUNT(n.ID) AS news_num FROM - epdc_group g + epdc_news n WHERE - g.STATE = '10' -AND g.DEL_FLAG = '0' -AND find_in_set(${streetId}, g.ALL_DEPT_IDS); + n.DEL_FLAG = '0' + AND find_in_set(${streetId}, n.ALL_DEPT_IDS); 0 N @@ -1030,12 +1491,12 @@ AND find_in_set(${streetId}, g.ALL_DEPT_IDS); 192 - 176 + 416 Y - 总议题数 + 日新增结案议题数 TableInput Y @@ -1047,12 +1508,14 @@ AND find_in_set(${streetId}, g.ALL_DEPT_IDS); source_ys_events SELECT - COUNT(i.ID) AS case_num + COUNT(i.ID) AS topic_finish_num FROM epdc_issue i WHERE i.DEL_FLAG = '0' - AND find_in_set(${streetId}, i.ALL_DEPT_IDS); + AND ISSUE_STATE ='2' + AND find_in_set(${streetId}, i.ALL_DEPT_IDS) + AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); 0 N @@ -1140,12 +1603,12 @@ WHERE 608 - 96 + 256 Y - 总项目数 + 日新增结案项目数 TableInput Y @@ -1157,12 +1620,14 @@ WHERE source_ys_events SELECT - COUNT(i.ID) AS project_num + COUNT(i.ID) AS project_finish_num FROM epdc_item i WHERE i.DEL_FLAG = '0' - AND find_in_set(${streetId}, i.ALL_DEPT_IDS); + AND i.ITEM_STATE = '10' + AND find_in_set(${streetId}, i.ALL_DEPT_IDS) + AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); 0 N @@ -1250,12 +1715,12 @@ WHERE 608 - 336 + 496 Y - 新增新闻数 + 日新增议题数 TableInput Y @@ -1265,15 +1730,15 @@ WHERE none - source_ys_news + source_ys_events SELECT - COUNT(n.ID) AS new_news_num + COUNT(i.ID) AS new_case_num FROM - epdc_news n + epdc_issue i WHERE - n.DEL_FLAG = '0' - AND find_in_set(${streetId}, n.ALL_DEPT_IDS) - AND n.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + i.DEL_FLAG = '0' + AND find_in_set(${streetId}, i.ALL_DEPT_IDS) + AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); 0 N @@ -1360,13 +1825,13 @@ WHERE - 192 - 496 + 608 + 176 Y - 新闻数 + 日新增项目数 TableInput Y @@ -1376,14 +1841,15 @@ WHERE none - source_ys_news + source_ys_events SELECT - COUNT(n.ID) AS news_num + COUNT(i.ID) AS new_project_num FROM - epdc_news n + epdc_item i WHERE - n.DEL_FLAG = '0' - AND find_in_set(${streetId}, n.ALL_DEPT_IDS); + i.DEL_FLAG = '0' + AND find_in_set(${streetId}, i.ALL_DEPT_IDS) + AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); 0 N @@ -1470,13 +1936,13 @@ WHERE - 192 + 608 416 Y - 日新增结案议题数 + 月新增结案议题数 TableInput Y @@ -1495,7 +1961,7 @@ WHERE i.DEL_FLAG = '0' AND ISSUE_STATE ='2' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -1582,13 +2048,13 @@ WHERE - 608 + 1024 256 Y - 日新增结案项目数 + 月新增结案项目数 TableInput Y @@ -1607,7 +2073,7 @@ WHERE i.DEL_FLAG = '0' AND i.ITEM_STATE = '10' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -1694,13 +2160,13 @@ WHERE - 608 + 1024 496 Y - 日新增议题数 + 月新增议题数 TableInput Y @@ -1718,7 +2184,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -1805,13 +2271,13 @@ WHERE - 608 + 1024 176 Y - 日新增项目数 + 月新增项目数 TableInput Y @@ -1829,7 +2295,7 @@ FROM WHERE i.DEL_FLAG = '0' AND find_in_set(${streetId}, i.ALL_DEPT_IDS) - AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); + AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 0 N @@ -1916,7 +2382,7 @@ WHERE - 608 + 1024 416 Y @@ -2449,6 +2915,142 @@ WHERE Y + + 设置月新增结案议题数变量 + SetVariable + + Y + + 1 + + none + + + + + topic_finish_num + topic_finish_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1264 + 256 + Y + + + + 设置月新增结案项目数变量 + SetVariable + + Y + + 1 + + none + + + + + project_finish_num + project_finish_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1264 + 496 + Y + + + + 设置月新增议题数变量 + SetVariable + + Y + + 1 + + none + + + + + new_case_num + new_case_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1264 + 176 + Y + + + + 设置月新增项目数变量 + SetVariable + + Y + + 1 + + none + + + + + new_project_num + new_project_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1264 + 416 + Y + + 设置注册用户数变量 SetVariable diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr index 8b8cd5f..bfc6077 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_update.ktr @@ -620,6 +620,56 @@ VALUES Y + + 议题项目趋势分析-按月统计 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + INSERT INTO ys_trend_month ( + cal_date, + project_total_num, + project_finish_num, + topic_total_num, + topic_finish_num, + create_time, + update_time +) +VALUES + ( + DATE_FORMAT(CURDATE(), '%Y-%m'), ${new_project_num_month}, ${project_finish_num_month}, ${new_case_num_month}, ${topic_finish_num_month}, NOW(), null + ) + N + + + + + + + + + + + + + + + + 704 + 240 + Y + + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr index 43189fc..0d56f74 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update.ktr @@ -790,7 +790,7 @@ source_ys_news SELECT COUNT(id) AS value, - DATE_FORMAT(NOW(), '%Y') AS cal_date, + DATE_FORMAT(CURDATE(), '%Y') AS cal_date, NEWS_PROPERTY AS name, now() AS create_time FROM diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr index 5abfb4b..8d69825 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_news_update_year.ktr @@ -704,7 +704,7 @@ FROM WHERE DEL_FLAG = '0' AND find_in_set(${streetId}, ALL_DEPT_IDS) - AND CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 YEAR) + AND YEAR (CREATED_TIME) = YEAR (date_sub(now(), INTERVAL 1 YEAR)) GROUP BY NEWS_PROPERTY 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb index 7cb13ca..1f131dc 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb @@ -940,6 +940,44 @@ true; 352 + + 清空新闻表 + + TRANS + + filename + + ${Internal.Entry.Current.Directory}/yushan_month_delete_st.ktr + + N + N + N + N + N + N + + + N + N + Basic + N + + N + Y + N + N + N + Pentaho local + + Y + + N + Y + 0 + 288 + 656 + + @@ -1160,7 +1198,7 @@ true; Start - 街道下标 + 社区下标 0 0 Y @@ -1169,13 +1207,22 @@ true; Start - 社区下标 + 清空新闻表 0 0 Y Y Y + + 清空新闻表 + 街道下标 + 0 + 0 + Y + Y + N + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr index a4712f8..da60509 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_co.ktr @@ -567,7 +567,7 @@ N Y N - delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId}; + delete from ys_news where cal_date like YEAR (NOW()) and comm_id = ${commId} AND comm_id IS NOT NULL;; N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr index 7d9ff05..a7add19 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month_delete_st.ktr @@ -529,7 +529,7 @@ N Y N - delete from ys_news where cal_date like YEAR (NOW()); + delete from ys_news where cal_date like YEAR (NOW()) AND comm_id IS NULL ; N diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb index 5db499a..a900321 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_street_month.kjb @@ -321,7 +321,7 @@ N Y 0 - 240 + 384 208 @@ -359,7 +359,7 @@ N Y 0 - 416 + 576 208 @@ -419,7 +419,7 @@ N Y 0 - 608 + 768 208 @@ -457,53 +457,15 @@ N Y 0 - 608 - 320 - - - - 清空新闻表 - - TRANS - - filename - - ${Internal.Entry.Current.Directory}/yushan_month_delete_st.ktr - - N - N - N - N - N - N - - - N - N - Basic - N - - N - Y - N - N - N - Pentaho local - - Y - - N - Y - 0 - 416 - 320 + 576 + 96 - 街道ID,NAME - 获取街道信息变量 + 获取街道信息变量 + 写入写入议题项目趋势分析-按月统计 0 0 Y @@ -511,17 +473,8 @@ N - Start - 街道ID,NAME - 0 - 0 - Y - Y - Y - - - 获取街道信息变量 - 写入写入议题项目趋势分析-按月统计 + 街道ID,NAME + 获取街道信息变量 0 0 Y @@ -530,7 +483,7 @@ 街道ID,NAME - 清空新闻表 + 写入表 0 0 Y @@ -538,13 +491,13 @@ N - 清空新闻表 - 写入表 + Start + 街道ID,NAME 0 0 Y Y - N + Y