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 c05b7c8..e19e744 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 @@ -882,6 +882,26 @@ 设置日新增结案项目数变量 Y + + 月新增结案议题数 + 设置月新增结案议题数变量 + Y + + + 月新增议题数 + 设置月新增议题数变量 + Y + + + 月新增结案项目数 + 设置月新增结案项目数变量 + Y + + + 月新增项目数 + 设置月新增项目数变量 + Y + 党员数 @@ -2633,6 +2653,588 @@ WHERE Y + + 月新增结案议题数 + TableInput + + Y + + 1 + + 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 + + + + + + + + + + + + 1072 + 256 + Y + + + + 月新增议题数 + TableInput + + Y + + 1 + + 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 + + + + + + + + + + + + 1072 + 176 + Y + + + + 设置月新增结案议题数变量 + SetVariable + + Y + + 1 + + none + + + + + topic_finish_num + topic_finish_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1312 + 256 + Y + + + + 设置月新增议题数变量 + SetVariable + + Y + + 1 + + none + + + + + new_case_num + new_case_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1312 + 176 + Y + + + + 月新增结案项目数 + TableInput + + Y + + 1 + + none + + + source_ys_events + SELECT + COUNT(i.ID) AS project_finish_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') + 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 + + + + + + + + + + + + 1072 + 496 + Y + + + + 月新增项目数 + TableInput + + Y + + 1 + + none + + + 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 + + + + + + + + + + + + 1072 + 416 + Y + + + + 设置月新增结案项目数变量 + SetVariable + + Y + + 1 + + none + + + + + project_finish_num + project_finish_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1312 + 496 + Y + + + + 设置月新增项目数变量 + SetVariable + + Y + + 1 + + none + + + + + new_project_num + new_project_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 1312 + 416 + 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 31e646d..c5b3140 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}', DATE_SUB(CURDATE(), INTERVAL 1 DAY), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null + ${commId}, '${commName}', CURDATE(), ${new_project_num}, ${project_finish_num}, ${new_case_num}, ${topic_finish_num}, NOW(), null ) N @@ -625,6 +625,58 @@ VALUES Y + + 议题项目趋势分析-按月统计 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + INSERT INTO ys_trend_month ( + comm_id, + comm_name, + cal_date, + project_total_num, + project_finish_num, + topic_total_num, + topic_finish_num, + create_time, + update_time +) +VALUES + ( + ${commId}, '${commName}', 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 + 224 + Y + + 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 166e58f..7e10ac1 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 @@ -759,17 +759,17 @@ 本月用户注册党员数 - 设置上月用户注册党员数 + 设置本月用户注册党员数 Y 本月用户注册数 - 设置上月用户注册数 + 设置本月用户注册数 Y - 上月用户注册社群数 - 设置上月用户注册社群数 + 当月用户注册社群数 + 设置本月用户注册社群数 Y @@ -784,7 +784,7 @@ 设置变量 5 - 上月用户注册社群数 + 当月用户注册社群数 Y @@ -797,9 +797,39 @@ 当月总议题数项目数 Y + + 当年用户注册社群数 + 设置当年用户注册社群数 + Y + + + 当年用户注册党员数 + 设置当年用户注册党员数 + Y + + + 当年用户注册数 + 设置当年用户注册数 + Y + + + 设置变量 3 2 + 当年用户注册数 + Y + + + 设置变量 4 2 + 当年用户注册党员数 + Y + + + 设置变量 5 2 + 当年用户注册社群数 + Y + - 上月用户注册社群数 + 当年用户注册党员数 TableInput Y @@ -809,15 +839,16 @@ none - source_ys_group + source_ys_user SELECT - COUNT(id) as reg_group_num + COUNT(u.ID) as reg_party_num FROM - epdc_group + epdc_user u WHERE - DEL_FLAG = '0' - 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); + 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 @@ -928,12 +959,12 @@ WHERE 928 - 432 + 544 Y - 本月用户注册党员数 + 当年用户注册数 TableInput Y @@ -945,14 +976,13 @@ WHERE source_ys_user SELECT - COUNT(u.ID) as reg_party_num + COUNT(u.ID) as reg_user_num FROM epdc_user u WHERE u.DEL_FLAG = '0' -AND u.PARTY_FLAG = '1' -AND DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') -AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + AND YEAR (u.REGISTER_TIME) = YEAR (NOW()) + AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 0 N @@ -1063,12 +1093,12 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 928 - 320 + 432 Y - 本月用户注册数 + 当年用户注册社群数 TableInput Y @@ -1078,15 +1108,15 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); none - source_ys_user + source_ys_group SELECT - COUNT(u.ID) as reg_user_num + COUNT(id) as reg_group_num FROM - epdc_user u + epdc_group WHERE - u.DEL_FLAG = '0' - AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') - AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + DEL_FLAG = '0' + AND YEAR (CREATED_TIME) = YEAR (NOW()) + AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 N @@ -1197,12 +1227,12 @@ WHERE 928 - 208 + 656 Y - 注册用户数 + 当月总议题数项目数 TableInput Y @@ -1212,21 +1242,142 @@ WHERE none - source_ys_user + source_ys_events SELECT - COUNT(u.id) register_num + SUM(topic_num) AS topic_num_month, + SUM(project_num) AS project_num_month, + GRID_ID AS grid_id, + DATE_FORMAT(NOW(),'%Y-%m') AS cal_date FROM - epdc_user u -WHERE - u.DEL_FLAG = '0' -AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + ( + SELECT + COUNT(id) AS topic_num, + 0 AS project_num, + GRID_ID + FROM + epdc_issue + WHERE + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + AND GRID_ID = ${gridId} + GROUP BY + GRID_ID + UNION ALL + SELECT + 0 AS topic_num, + COUNT(id) AS project_num, + GRID_ID + FROM + epdc_item + WHERE + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + AND GRID_ID = ${gridId} + GROUP BY + GRID_ID + ) t +GROUP BY + t.GRID_ID 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 + 0 + 上月总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 上月总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + @@ -1237,12 +1388,12 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); 352 - 320 + 576 Y - 社区ID，社区name + 当月用户注册社群数 TableInput Y @@ -1252,23 +1403,15 @@ AND find_in_set(${gridId}, u.ALL_DEPT_IDS); none - source_ys_admin + source_ys_group SELECT - id AS commId, - NAME AS commName + COUNT(id) as reg_group_num FROM - sys_dept + epdc_group WHERE - id = ( - SELECT - pid - FROM - sys_dept - WHERE - del_flag = '0' - AND id = ${gridId} - ) -AND del_flag = '0' + DEL_FLAG = '0' + AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') + AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 N @@ -1282,7 +1425,7 @@ AND del_flag = '0' topic_num 42 0 - 上月总议题数 + 今年总议题数 topic_num ######0.0###################;-######0.0################### . @@ -1305,7 +1448,7 @@ AND del_flag = '0' project_num 41 0 - 上月总议题数 + 今年总议题数 project_num ######0.0###################;-######0.0################### . @@ -1328,7 +1471,7 @@ AND del_flag = '0' grid_id 15 0 - 上月总议题数 + 今年总议题数 grid_id ####0;-####0 . @@ -1351,7 +1494,7 @@ AND del_flag = '0' cal_date 7 -1 - 上月总议题数 + 今年总议题数 cal_date . @@ -1378,8 +1521,8 @@ AND del_flag = '0' - 352 - 96 + 928 + 320 Y @@ -1494,8 +1637,8 @@ WHERE - 设置上月用户注册党员数 - SetVariable + 本月用户注册党员数 + TableInput Y @@ -1504,37 +1647,574 @@ WHERE none - - - reg_party_num - reg_party_num - PARENT_JOB - - - - Y - - - - - - - - - - 1168 - 320 - Y - - - - 设置上月用户注册数 - SetVariable - - Y - - 1 - + 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 DATE_FORMAT(u.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') +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 + 0 + 今年总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 今年总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 928 + 208 + Y + + + + 本月用户注册数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.ID) as reg_user_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' + AND DATE_FORMAT(u.REGISTER_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') + 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 + 0 + 今年总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 今年总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 928 + 96 + Y + + + + 注册用户数 + TableInput + + Y + + 1 + + none + + + source_ys_user + SELECT + COUNT(u.id) register_num +FROM + epdc_user u +WHERE + u.DEL_FLAG = '0' +AND find_in_set(${gridId}, u.ALL_DEPT_IDS); + 0 + + N + Y + N + N + + + + + + + + + + + 352 + 320 + Y + + + + 社区ID，社区name + TableInput + + Y + + 1 + + none + + + source_ys_admin + SELECT + id AS commId, + NAME AS commName +FROM + sys_dept +WHERE + id = ( + SELECT + pid + FROM + sys_dept + WHERE + del_flag = '0' + AND id = ${gridId} + ) +AND del_flag = '0' + 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 + 0 + 上月总议题数 + grid_id + ####0;-####0 + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + String + normal + cal_date + 7 + -1 + 上月总议题数 + cal_date + + . + , + + none + N + Y + 0 + N + N + N + zh_CN + Asia/Shanghai + N + + + + + + + + + + + + 352 + 96 + Y + + + + 设置上月总议题数项目数变量 + SetVariable + + Y + + 1 + + none + + + + + cal_date + cal_date + PARENT_JOB + + + + grid_id + grid_id + PARENT_JOB + + + + project_num_month + project_num_month + PARENT_JOB + + + + topic_num_month + topic_num_month + PARENT_JOB + + + + Y + + + + + + + + + + 592 + 576 + Y + + + + 设置本月用户注册党员数 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num + reg_party_num + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 208 + Y + + + + 设置当年用户注册党员数 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num + reg_party_num_year + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 544 + Y + + + + 设置本月用户注册数 + SetVariable + + Y + + 1 + none @@ -1557,12 +2237,12 @@ WHERE 1168 - 208 + 96 Y - 设置上月用户注册社群数 + 设置本月用户注册社群数 SetVariable Y @@ -1591,7 +2271,81 @@ WHERE 1168 - 432 + 320 + Y + + + + 设置当年用户注册社群数 + SetVariable + + Y + + 1 + + none + + + + + reg_group_num + reg_group_num_year + PARENT_JOB + + + + Y + + + + + + + + + + 1168 + 656 + Y + + + + 设置变量 + SetVariable + + Y + + 1 + + none + + + + + topic_num_month + topic_num_month + PARENT_JOB + 0 + + + project_num_month + project_num_month + PARENT_JOB + 0 + + + Y + + + + + + + + + + 208 + 576 Y @@ -1625,7 +2379,41 @@ WHERE 784 - 208 + 96 + Y + + + + 设置变量 3 2 + SetVariable + + Y + + 1 + + none + + + + + reg_user_num_year + reg_user_num_year + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 432 Y @@ -1659,7 +2447,41 @@ WHERE 784 - 320 + 208 + Y + + + + 设置变量 4 2 + SetVariable + + Y + + 1 + + none + + + + + reg_party_num_year + reg_party_num_year + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 544 Y @@ -1692,7 +2514,75 @@ WHERE - 784 + 784 + 320 + Y + + + + 设置变量 5 2 + SetVariable + + Y + + 1 + + none + + + + + reg_group_num_year + reg_group_num_year + PARENT_JOB + 0 + + + Y + + + + + + + + + + 784 + 656 + Y + + + + 设置当年用户注册数 + SetVariable + + Y + + 1 + + none + + + + + reg_user_num + reg_user_num_year + PARENT_JOB + + + + Y + + + + + + + + + + 1168 432 Y @@ -1949,259 +2839,6 @@ WHERE Y - - 当月总议题数项目数 - TableInput - - Y - - 1 - - none - - - source_ys_events - SELECT - SUM(topic_num) AS topic_num_month, - SUM(project_num) AS project_num_month, - GRID_ID AS grid_id, - DATE_FORMAT(NOW(),'%Y-%m') AS cal_date -FROM - ( - SELECT - COUNT(id) AS topic_num, - 0 AS project_num, - GRID_ID - FROM - epdc_issue - WHERE - DEL_FLAG = '0' - AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') - AND GRID_ID = ${gridId} - GROUP BY - GRID_ID - UNION ALL - SELECT - 0 AS topic_num, - COUNT(id) AS project_num, - GRID_ID - FROM - epdc_item - WHERE - DEL_FLAG = '0' - AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') - AND GRID_ID = ${gridId} - GROUP BY - GRID_ID - ) t -GROUP BY - t.GRID_ID - 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 - 0 - 上月总议题数 - grid_id - ####0;-####0 - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - String - normal - cal_date - 7 - -1 - 上月总议题数 - cal_date - - . - , - - none - N - Y - 0 - N - N - N - zh_CN - Asia/Shanghai - N - - - - - - - - - - - - 352 - 576 - Y - - - - 设置上月总议题数项目数变量 - SetVariable - - Y - - 1 - - none - - - - - cal_date - cal_date - PARENT_JOB - - - - grid_id - grid_id - PARENT_JOB - - - - project_num_month - project_num_month - PARENT_JOB - - - - topic_num_month - topic_num_month - PARENT_JOB - - - - Y - - - - - - - - - - 592 - 576 - Y - - - - 设置变量 - SetVariable - - Y - - 1 - - none - - - - - topic_num_month - topic_num_month - PARENT_JOB - 0 - - - project_num_month - project_num_month - PARENT_JOB - 0 - - - Y - - - - - - - - - - 208 - 576 - Y - - diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr index aa67f37..c9c2b5e 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_update.ktr @@ -641,59 +641,6 @@ VALUES Y - - 网格注册信息表 - ExecSQL - - Y - - 1 - - none - - - target_yushan - N - N - Y - N - INSERT INTO ys_grid_reg ( - comm_id, - comm_name, - cal_date, - name, - grid_id, - reg_user_num, - reg_party_num, - reg_group_num, - create_time, - update_time -) -VALUES - ( - ${commId}, '${commName}', DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null - ) - N - - - - - - - - - - - - - - - - 272 - 368 - Y - - diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_day.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_day.ktr index 922d185..6bb1fe5 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_day.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_ys_grid_rank_month_update_day.ktr @@ -565,6 +565,59 @@ VALUES Y + + 网格注册信息表-月 + ExecSQL + + Y + + 1 + + none + + + target_yushan + N + N + Y + N + INSERT INTO ys_grid_reg ( + comm_id, + comm_name, + cal_date, + name, + grid_id, + reg_user_num, + reg_party_num, + reg_group_num, + create_time, + update_time +) +VALUES + ( + ${commId}, '${commName}', DATE_FORMAT(CURDATE(), '%Y-%m'), '${communityGrid}', ${gridId}, ${reg_user_num}, ${reg_party_num}, ${reg_group_num}, NOW(), null + ) + N + + + + + + + + + + + + + + + + 443 + 360 + Y + + diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb index 35c1bb5..a7ef747 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_day.kjb @@ -294,8 +294,8 @@ Y N - Y - 2 + N + 0 10 0 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 b4c122a..7cb13ca 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb +++ b/epdc-cloud-property/doc/kettle/screen-yushan/yushan_month.kjb @@ -294,8 +294,8 @@ Y N - Y - 4 + N + 0 10 0 0