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 016caa6..40bcb24 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 @@ -1530,7 +1530,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); @@ -1600,7 +1601,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${commId}', i.ALL_DEPT_IDS) @@ -1671,7 +1673,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); @@ -1741,7 +1744,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); @@ -1811,7 +1815,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ISSUE_STATE ='2' AND find_in_set('${commId}', i.ALL_DEPT_IDS) @@ -1883,7 +1888,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') @@ -1953,7 +1959,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') @@ -2023,7 +2030,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') @@ -2331,7 +2339,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 @@ -3046,7 +3055,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 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 87276de..56f1f60 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 @@ -1304,7 +1304,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1421,7 +1422,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1537,7 +1539,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1653,7 +1656,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1985,7 +1989,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -2577,7 +2582,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 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 c7fab42..a3eddaa 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 @@ -1305,7 +1305,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ISSUE_STATE ='2' AND find_in_set('${commId}', i.ALL_DEPT_IDS) @@ -1425,7 +1426,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1543,7 +1545,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1661,7 +1664,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1995,7 +1999,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); @@ -2587,7 +2592,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr index 1fb65fc..a1ec66f 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm.ktr @@ -580,8 +580,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC, diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr index d8ad816..5bea410 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_comm_query_comm_info.ktr @@ -539,8 +539,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC, 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 40df7c6..82bbfcb 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 @@ -870,7 +870,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ISSUE_STATE ='2' AND find_in_set('${commId}', i.ALL_DEPT_IDS) @@ -941,7 +942,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${commId}', i.ALL_DEPT_IDS) @@ -1012,7 +1014,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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') @@ -1082,7 +1085,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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') @@ -1152,7 +1156,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 @@ -1493,7 +1498,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${commId}', i.ALL_DEPT_IDS); 0 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 0ba51a3..b4dfa09 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 @@ -1101,7 +1101,8 @@ AND ISSUE_STATE = '2' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1217,7 +1218,8 @@ AND ITEM_STATE = '10' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -1737,7 +1739,8 @@ AND ITEM_STATE = '10' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, ALL_DEPT_IDS); @@ -1862,7 +1865,8 @@ FROM AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND GRID_ID = ${gridId} @@ -1880,7 +1884,8 @@ AND grid_id NOT IN ( AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND GRID_ID = ${gridId} @@ -2159,7 +2164,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(NOW(), '%Y%m') AND find_in_set(${gridId}, i.ALL_DEPT_IDS); @@ -2275,7 +2281,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 @@ -3923,7 +3930,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_all.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_all.ktr index 22a335a..e11a6af 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_all.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_all.ktr @@ -850,7 +850,8 @@ AND ISSUE_STATE = '2' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, ALL_DEPT_IDS); @@ -966,7 +967,8 @@ WHERE AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ITEM_STATE = '10' AND CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) @@ -1204,7 +1206,8 @@ FROM AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') AND GRID_ID = ${gridId} @@ -1222,7 +1225,8 @@ AND grid_id NOT IN ( AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') AND GRID_ID = ${gridId} @@ -1612,7 +1616,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); @@ -2908,7 +2913,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr index 12bcb29..98597f9 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid.ktr @@ -580,8 +580,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC, diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr index 5801247..19a1763 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_grid_query_grid_info.ktr @@ -539,8 +539,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC, 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 d7d88b6..805f6ed 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 @@ -865,7 +865,8 @@ AND ITEM_STATE = '10' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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); @@ -990,7 +991,8 @@ FROM AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} @@ -1008,7 +1010,8 @@ AND grid_id NOT IN ( AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') AND GRID_ID = ${gridId} @@ -1556,7 +1559,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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); @@ -1681,7 +1685,8 @@ FROM AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (CREATED_TIME) = YEAR (NOW()) AND GRID_ID = ${gridId} @@ -1699,7 +1704,8 @@ AND grid_id NOT IN ( AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (CREATED_TIME) = YEAR (NOW()) AND GRID_ID = ${gridId} @@ -1844,7 +1850,8 @@ AND ITEM_STATE = '10' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (CREATED_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, ALL_DEPT_IDS); @@ -2364,7 +2371,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (i.CREATED_TIME) = YEAR (NOW()) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 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 a8e1be9..42ff421 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 @@ -815,7 +815,8 @@ AND ITEM_STATE = '10' AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (CREATED_TIME) = YEAR ( date_sub(now(), INTERVAL 1 YEAR) ) AND find_in_set(${gridId}, ALL_DEPT_IDS); @@ -940,7 +941,8 @@ FROM AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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' ) @@ -959,7 +961,8 @@ AND STR_TO_DATE( CONCAT( YEAR ( NOW()), '-01-01' ), '%Y-%m-%d' ) AND grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) 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' ) @@ -1511,7 +1514,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND YEAR (i.CREATED_TIME) = YEAR ( date_sub(now(), INTERVAL 1 YEAR) ) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 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 2451810..ccf0ab6 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 @@ -1075,7 +1075,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS); 0 @@ -1144,7 +1145,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS); 0 @@ -1434,7 +1436,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ISSUE_STATE ='2' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1505,7 +1508,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1576,7 +1580,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); @@ -1646,7 +1651,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME > DATE_SUB(CURDATE(), INTERVAL 1 DAY); @@ -1716,7 +1722,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ISSUE_STATE ='2' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1788,7 +1795,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') @@ -1858,7 +1866,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') @@ -1928,7 +1937,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m') 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 e2d8db1..b806d09 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 @@ -1303,7 +1303,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ISSUE_STATE ='2' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1420,7 +1421,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1537,7 +1539,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1653,7 +1656,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -1985,7 +1989,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') @@ -2577,7 +2582,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') 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 742b838..e0a2d10 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 @@ -1306,7 +1306,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1424,7 +1425,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1543,7 +1545,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1661,7 +1664,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1995,7 +1999,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); @@ -2587,7 +2592,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 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 c598708..a2db165 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 @@ -649,7 +649,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS); 0 @@ -718,7 +719,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS); 0 @@ -1008,7 +1010,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND ISSUE_STATE ='2' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1079,7 +1082,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND i.ITEM_STATE = '10' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) @@ -1150,7 +1154,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') @@ -1220,7 +1225,8 @@ WHERE AND i.grid_id NOT IN ( 1258690654403125249, 1258690914995232770, - 1258691044142047233 + 1258691044142047233, + 1258587880499798017 ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND DATE_FORMAT(i.CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 1 MONTH), '%Y%m') diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr index dbf7425..273b46a 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street.ktr @@ -580,8 +580,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC, diff --git a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr index 5899b95..0e46920 100644 --- a/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr +++ b/epdc-cloud-property/doc/kettle/screen-yushan/screen_totality_street_query_street_info.ktr @@ -539,8 +539,9 @@ WHERE AND del_flag = 0 AND id NOT IN ( 1258690654403125249, - 1258690914995232770, - 1258691044142047233 + 1258690914995232770, + 1258691044142047233, + 1258587880499798017 ) ORDER BY create_date ASC,