From fa3917f6382a8edfec38e0b5b718cf99886db56c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 25 May 2020 16:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E9=A1=B9=E7=9B=AE=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91-=E3=80=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=84=8F=E8=A7=81=E6=B7=BB=E5=8A=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/05/25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/user/UserAnalysisDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 18a86644f..063a62906 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -154,7 +154,7 @@ esua_epdc_events.epdc_item item LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process WHERE - DEL_FLAG = '0' + DEL_FLAG = '0' and (state=0 or state=5 or state=10 ) AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime} @@ -709,7 +709,7 @@ left join esua_epdc_admin.sys_dept sd on eie.GRID_ID=sd.ID where sd.del_flag='0') item LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, ITEM_ID FROM esua_epdc_events.epdc_item_handle_process WHERE - DEL_FLAG = '0' + DEL_FLAG = '0' and (state=0 or state=5 or state=10 ) AND DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') <= #{endTime}