From bdee6e5fe9581c9e7ca05278dd457bd86b97e4ff Mon Sep 17 00:00:00 2001 From: weikai <123456> Date: Wed, 15 Jul 2020 10:32:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=94=A6=E6=B0=B4pc=E7=AB=AF=E3=80=91?= =?UTF-8?q?-=E3=80=90=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=9D=97=E3=80=91-=E9=AD=8F=E5=87=AF=202020-?= =?UTF-8?q?07-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/issue/IssueAnalysisDao.xml | 14 +++++++------- .../main/resources/mapper/item/ItemAnalysisDao.xml | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml index 03a8f7e5..e5a9de28 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/issue/IssueAnalysisDao.xml @@ -16,8 +16,8 @@ ee.BROWSE_NUM, ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum FROM - esua_epdc_events.epdc_issue ei - LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID + js_esua_epdc_events.epdc_issue ei + LEFT JOIN js_esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID AND ee.DEL_FLAG = '0' WHERE ei.DEL_FLAG = '0' @@ -64,8 +64,8 @@ ee.BROWSE_NUM, ( ee.COMMENT_NUM + ee.BROWSE_NUM + ee.APPROVE_NUM + ee.OPPOSE_NUM ) AS expressAttitudeNum FROM - esua_epdc_events.epdc_issue ei - LEFT JOIN esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID + js_esua_epdc_events.epdc_issue ei + LEFT JOIN js_esua_epdc_events.epdc_events ee ON ee.ID = ei.EVENT_ID AND ee.DEL_FLAG = '0' WHERE ei.DEL_FLAG = '0' @@ -142,7 +142,7 @@ SUM( ei.ISSUE_STATE = 4 ) AS itemNum, '1' as categoryLevel FROM - esua_epdc_events.epdc_issue ei + js_esua_epdc_events.epdc_issue ei WHERE ei.DEL_FLAG = '0' GROUP BY @@ -160,7 +160,7 @@ SUM( ei.ISSUE_STATE = 4 ) AS itemNum, '2' as categoryLevel FROM - esua_epdc_events.epdc_issue ei + js_esua_epdc_events.epdc_issue ei WHERE ei.DEL_FLAG = '0' AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 0 @@ -180,7 +180,7 @@ SUM( ei.ISSUE_STATE = 4 ) AS itemNum, '3' as categoryLevel FROM - esua_epdc_events.epdc_issue ei + js_esua_epdc_events.epdc_issue ei WHERE ei.DEL_FLAG = '0' AND ( LENGTH( ei.CATEGORY_FULL_NAME ) - LENGTH( REPLACE ( ei.CATEGORY_FULL_NAME, '-', '' ) ) ) > 1 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml index 4da8ddd3..af50e655 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml @@ -127,21 +127,21 @@ ei.ID, ei.ITEM_CONTENT, ei.CREATED_TIME, - ( SELECT COUNT( eihp.ID ) FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND + ( SELECT COUNT( eihp.ID ) FROM js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS operatNum, - ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM esua_epdc_events.epdc_item_grid_platform eigp + ( SELECT CASE WHEN COUNT(eigp.ID) > 0 THEN '1' ELSE '0' END FROM js_esua_epdc_events.epdc_item_grid_platform eigp WHERE eigp.DEL_FLAG = '0' AND eigp.REFERENCE_ID = ei.ID ) AS reportFlag, - ( SELECT COUNT(eid.ID) FROM esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID + ( SELECT COUNT(eid.ID) FROM js_esua_epdc_events.epdc_item_dept eid WHERE eid.DEL_FLAG = '0' AND eid.ITEM_ID = ei.ID ) AS deptNum, ei.ITEM_STATE, - ( SELECT eihp.CREATED_TIME FROM esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND + ( SELECT eihp.CREATED_TIME FROM js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID AND eihp.STATE IN (5, 10) LIMIT 1 ) AS processedTime, ( SELECT TIMESTAMPDIFF( HOUR, MIN(eihp.CREATED_TIME), MAX(eihp.CREATED_TIME) ) FROM - esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime, + js_esua_epdc_events.epdc_item_handle_process eihp WHERE eihp.DEL_FLAG = '0' AND eihp.ITEM_ID = ei.ID ) AS takeTime, ei.ALL_DEPT_NAMES, ei.EVALUATION_SCORE FROM - esua_epdc_events.epdc_item ei + js_esua_epdc_events.epdc_item ei WHERE ei.DEL_FLAG = '0' AND ei.GRID_ID IN