From dfa3b399f88d99d79b91e4c0246ff9cb1331ae6e Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 28 Nov 2019 14:23:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/events/entity/EpdcEventsEntity.java | 12 +++++++++++- .../events/service/impl/EpdcEventsServiceImpl.java | 4 ++-- .../esua/epdc/modules/issue/entity/IssueEntity.java | 6 +++--- .../esua/epdc/modules/item/entity/ItemEntity.java | 6 +++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java index d9676c0ea..3f159f33d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java @@ -122,7 +122,7 @@ public class EpdcEventsEntity extends BaseEpdcEntity { */ private String issueAddress; /** - * 议题分类ID + * 议题分类编码 */ private String categoryCode; /** @@ -173,4 +173,14 @@ public class EpdcEventsEntity extends BaseEpdcEntity { */ private String topicId; + /** + * 一级分类编码 + */ + private String firstCategoryCode; + + /** + * 分类全称 + */ + private String categoryFullName; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index e170c2ba9..7aab3c721 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -357,7 +357,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl cateList = categoryService.getPidListById(Long.parseLong(entity.getCategoryCode())); if(cateList != null && cateList.size() > 0) { - issueEntity.setFirstcategoryCode(cateList.get(0).getCategoryCode()); + issueEntity.setFirstCategoryCode(cateList.get(0).getCategoryCode()); String name = ""; for (int i = 0; i < cateList.size(); i++){ if (i == cateList.size() -1){ @@ -369,7 +369,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl Date: Thu, 28 Nov 2019 14:33:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E5=85=9A=E5=91=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index c99fb251a..c9e08633c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -193,12 +193,12 @@ eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE as dwellingPlace, '1' as authenticatedFlag, - eu.STREET as streetName, - eu.COMMUNITY as communityName, - eu.GRID as gridName, + SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',1) as streetName, + SUBSTRING_INDEX(SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',2),'-',-1)as communityName, + SUBSTRING_INDEX(eu.ALL_DEPT_NAMES,'-',-1) as gridName, eu.PARTY_FLAG as partyFlag, epm.CADRE_FLAG as cadreFlag, - CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName, + eu.ALL_DEPT_NAMES as completeName, eugr.LEADER_FLAG as leaderFlag, eut.TAG_NAME as tagName FROM