From 4227e6d435f7f2fef7a7d0e8df9eb9afbbd90bb6 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 22 May 2020 21:20:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=90=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E3=80=91=E3=80=90=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/user/form/ExportOperationFormDTO.java | 3 ++- .../user/service/impl/UserAnalysisServiceImpl.java | 1 + .../src/main/resources/mapper/user/UserAnalysisDao.xml | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java index b4fb1ec0f..f8ebbe511 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/form/ExportOperationFormDTO.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.user.form; import lombok.Data; import java.io.Serializable; -import java.util.Date; import java.util.List; @Data @@ -21,4 +20,6 @@ public class ExportOperationFormDTO implements Serializable { private List allStreetIds; private String endTime; + + private List deptIdList; } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index ee9d26ec4..548fb0e82 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -306,6 +306,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl listExportOperationCount(ExportOperationFormDTO exportOperationFormDTO) { + exportOperationFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList()); List allStreetIds = new ArrayList<>(); for (Long[] item : exportOperationFormDTO.getAllDeptIdsShow()) { allStreetIds.add(item[0]); 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 7f2967910..1e8b99459 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 @@ -526,8 +526,6 @@ AND ad.del_flag = 0 ) t0 ON find_in_set(t0.id, IFNULL(uu.ALL_DEPT_IDS,RELATION.ALL_DEPT_IDS)) - - LEFT JOIN ( SELECT MAX( CREATED_TIME ) AS CREATED_TIME, USER_ID FROM esua_epdc_user.epdc_user_authenticate_history @@ -542,10 +540,11 @@ ) MAXHIS ON MAXHIS.USER_ID = uu.ID LEFT JOIN esua_epdc_user.epdc_user_authenticate_history HISTORY ON HISTORY.USER_ID = MAXHIS.USER_ID AND HISTORY.CREATED_TIME = MAXHIS.CREATED_TIME AND HISTORY.DEL_FLAG = '0' - - - where uu.DEL_FLAG = '0' + AND IFNULL(if(uu.dept_id=0,null,u.dept_id),RELATION.GRID_ID) IN + + #{deptId} + AND DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') BETWEEN #{operationStartTime} AND #{operationEndTime}