From 7ad5a2d4e00142915e445439fab2b7d16e89e39e Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 31 May 2023 10:19:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E5=A4=A7=E5=B1=8F=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=9A=90=E6=82=A3=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java | 4 ++++ .../src/main/resources/mapper/IcPlaceOrgDao.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java index f66f2d0ed9..ac4859bcfc 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlaceOrgDetailResultDTO.java @@ -79,4 +79,8 @@ public class PlaceOrgDetailResultDTO implements Serializable { private String reportPhone; + private String dangerType; + + private String dangerName; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml index 694c0022e6..3e9eb503af 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml @@ -139,6 +139,7 @@ p.LONGITUDE longitude, p.LATITUDE latitude, p.COMPANY_PROFILE companyProfile, + pr.DANGER_TYPE dangerType,pr.DANGER_NAME dangerName, s.NAME reporter,s.MOBILE reportPhone FROM ic_place_org p LEFT JOIN customer_grid b ON p.GRID_ID = b.ID From f61033e4ad44c43663d527e92af5536d001c3397 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 31 May 2023 11:16:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=89=E6=96=B0=E6=9D=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=90=84=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcEventDao.java | 2 +- .../epmet/service/impl/IcEventServiceImpl.java | 16 +++++++++------- .../src/main/resources/mapper/IcEventDao.xml | 14 ++++++++++++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index b2c7ba0c77..4b7826e546 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -218,5 +218,5 @@ public interface IcEventDao extends BaseDao { List getListBySourceTypeOrEventType(@Param("orgIdPath") String orgPath, @Param("sourceType") String sourceType, @Param("eventType") String eventType); - GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId); + GridOrVillageEventRateResultDTO getEventRateByGridIds(@Param("orgId") String orgId,@Param("orgType") String orgType); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index f457fc1071..8b8482827f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -2034,16 +2034,20 @@ public class IcEventServiceImpl extends BaseServiceImpl getEventRateByAgencyId(String agencyId) { List dtoList = new ArrayList<>(); + String orgType = ""; if (StringUtils.isNotEmpty(agencyId)) { List orgs = getSubOrgs(agencyId); if (null != orgs && orgs.size() > 0) {//获取所有的新村，根据新村的agencyId 查询事件，统计事件的各类完成情况； Map namesMap = new HashMap<>(); for (IcEventAnalysisOrgResDTO org : orgs) { + if (StringUtils.isEmpty(orgType)) { + orgType = org.getOrgType(); + } namesMap.put(org.getOrgId(), org.getOrgName()); } List ids = orgs.stream().map(IcEventAnalysisOrgResDTO::getOrgId).collect(Collectors.toList()); for (String id : ids) { - GridOrVillageEventRateResultDTO resultDto = baseDao.getEventRateByGridIds(id); + GridOrVillageEventRateResultDTO resultDto = baseDao.getEventRateByGridIds(id, orgType); if (null != resultDto) { resultDto.setAgencyName(namesMap.get(id)); resultDto.setOrgId(id); @@ -2092,12 +2096,10 @@ public class IcEventServiceImpl extends BaseServiceImpl e.DEL_FLAG = 0 - AND e.AGENCY_ID = #{orgId} + + AND e.AGENCY_ID = #{orgId} + + + AND e.GRID_ID = #{orgId} + ) ea, @@ -688,7 +693,12 @@ e.DEL_FLAG = 0 - AND e.AGENCY_ID = #{orgId} + + AND e.AGENCY_ID = #{orgId} + + + AND e.GRID_ID = #{orgId} + ) From 1d2723f99e89c860126aa206eb32ea25206f9c6d Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 31 May 2023 13:17:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=89=E6=96=B0=E6=9D=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=90=84=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AEsql?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEventDao.xml | 53 +++++-------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 176d57d27d..3a519996be 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -664,46 +664,21 @@ From 3bf41e01b6f7867226843597ab8ac115f7875625 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 31 May 2023 16:48:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8C=89=E6=96=B0=E6=9D=91=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=90=84=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AEsql?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcEventDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 3a519996be..7748652dcc 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -671,10 +671,10 @@ e.DEL_FLAG = 0 - + AND e.AGENCY_ID = #{orgId} - + AND e.GRID_ID = #{orgId}