From 5ec85b25f220992c7888b4a31b67c0b32f19d0d5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 29 Jun 2020 14:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=87=8F=E7=BB=9F=E8=AE=A1=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3=E7=BB=9F=E8=AE=A1=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=8C=87=E5=AE=9A=E7=BD=91=E6=A0=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen_totality_comm_query_all.ktr | 30 +++++++++++++++++++ .../screen_totality_comm_query_all_day.ktr | 30 +++++++++++++++++++ .../screen_totality_grid_query_all.ktr | 30 +++++++++++++++++++ .../screen_totality_street_query_all.ktr | 30 +++++++++++++++++++ .../screen_totality_street_query_all_dayy.ktr | 30 +++++++++++++++++++ 5 files changed, 150 insertions(+) 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 6373082..87276de 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 @@ -1301,6 +1301,11 @@ FROM WHERE i.DEL_FLAG = '0' AND i.ISSUE_STATE ='2' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1413,6 +1418,11 @@ FROM WHERE i.DEL_FLAG = '0' AND i.ITEM_STATE = '10' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1524,6 +1534,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1635,6 +1650,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1962,6 +1982,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -2549,6 +2574,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 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 923cbcf..c7fab42 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 @@ -1302,6 +1302,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.ISSUE_STATE ='2' AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1417,6 +1422,11 @@ FROM WHERE i.DEL_FLAG = '0' AND i.ITEM_STATE = '10' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1530,6 +1540,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1643,6 +1658,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1972,6 +1992,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 0 @@ -2559,6 +2584,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${commId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 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 ff234c0..22a335a 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 @@ -847,6 +847,11 @@ FROM WHERE DEL_FLAG = '0' AND ISSUE_STATE = '2' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, ALL_DEPT_IDS); 0 @@ -958,6 +963,11 @@ FROM epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND ITEM_STATE = '10' AND CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, ALL_DEPT_IDS); @@ -1191,6 +1201,11 @@ FROM epdc_issue WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -1204,6 +1219,11 @@ FROM epdc_item WHERE DEL_FLAG = '0' +AND grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND DATE_FORMAT(CREATED_TIME, '%Y%m') = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH), '%Y%m') AND GRID_ID = ${gridId} GROUP BY @@ -1589,6 +1609,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, i.ALL_DEPT_IDS); 0 @@ -2880,6 +2905,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${monthIndex} MONTH) AND find_in_set(${gridId}, i.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 e99279b..e2d8db1 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 @@ -1300,6 +1300,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.ISSUE_STATE ='2' 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') @@ -1412,6 +1417,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.ITEM_STATE = '10' 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') @@ -1524,6 +1534,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1635,6 +1650,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -1962,6 +1982,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 0 @@ -2549,6 +2574,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) 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') 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 99ee053..742b838 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 @@ -1303,6 +1303,11 @@ FROM WHERE i.DEL_FLAG = '0' AND i.ISSUE_STATE ='2' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1416,6 +1421,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND i.ITEM_STATE = '10' AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1530,6 +1540,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1643,6 +1658,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY) @@ -1972,6 +1992,11 @@ FROM epdc_issue i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 0 @@ -2559,6 +2584,11 @@ FROM epdc_item i WHERE i.DEL_FLAG = '0' +AND i.grid_id NOT IN ( + 1258690654403125249, + 1258690914995232770, + 1258691044142047233 + ) AND find_in_set('${streetId}', i.ALL_DEPT_IDS) AND i.CREATED_TIME < DATE_SUB(CURDATE(), INTERVAL ${dayIndex} DAY); 0