From cc7b97f37c2005ee3981c2bbf23a174defe95c86 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 9 Jun 2021 16:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BD=91=E6=A0=BC=E5=90=8D?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E5=88=B0=E4=B8=8A=E4=B8=A4=E7=BA=A7=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=81=B6=E5=BF=83=E4=BA=BA?= =?UTF-8?q?=E7=9A=84=E7=8E=A9=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govorg/impl/GovOrgServiceImpl.java | 1 + .../mapper/govorg/CustomerGridDao.xml | 20 +++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dfaff1bd06..e3c9752a00 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -233,6 +233,7 @@ public class GovOrgServiceImpl implements GovOrgService { **/ @Override public List gridListByStaffId(String staffId) { + //网格名是拼接上两级组织名称 List resultList = customerGridDao.gridListByStaffId(staffId); return resultList; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 000f2c2b49..3d00ea3cd4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -56,10 +56,22 @@ SELECT cg.id AS 'id', IF ( - ca.organization_name = '', - cg.grid_name, - CONCAT(ca.organization_name,'-',cg.grid_name) - ) AS 'gridName' + ca.pid = '0', + IF ( + ca.organization_name = '', + cg.grid_name, + CONCAT(ca.organization_name,'-',cg.grid_name) + ), + CONCAT( + (select organization_name from customer_agency where id = ca.pid), + '-', + IF ( + ca.organization_name = '', + cg.grid_name, + CONCAT(ca.organization_name,'-',cg.grid_name) + ) + ) + )AS 'gridName' FROM customer_grid cg INNER JOIN customer_agency ca ON cg.pid = ca.id