From 63fe397d7da92174d45501a75cd5d87f0ae1fbe7 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jul 2020 18:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E6=A8=A1=E5=9D=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=EF=BC=88=E5=AF=BC=E5=87=BA=E9=A1=B9?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=89-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07?= =?UTF-8?q?-15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java | 4 ++-- .../src/main/resources/mapper/user/UserAnalysisDao.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java index caa1831be..3b9d51954 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java @@ -13,8 +13,8 @@ public class GridOpiningExcel { @Excel(name = "网格名称") private String allDeptName; - @Excel(name = "网格党建指导员姓名") - private String gridLeader; +// @Excel(name = "网格党建指导员姓名") +// private String gridLeader; @Excel(name = "用户总数") private Integer registerCount; 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 a8c510a91..72b85e254 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 @@ -1312,6 +1312,7 @@ esua_epdc_admin.sys_dept ad WHERE ad.del_flag = 0 + AND ad.type_key = 'grid_party' AND ad.id in