From 5ebbd35276a129c2913a8320274966171aeb0ed7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 16 Dec 2021 16:59:50 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactAgencyGovernDailyEntity.java | 10 +++ .../datastats/impl/DataStatsServiceImpl.java | 17 ++-- .../mapper/datastats/DatsStatsDao.xml | 8 +- .../dto/extract/FactAgencyGovernDailyDTO.java | 9 +++ .../dto/extract/FactGridGovernDailyDTO.java | 9 +++ .../constant/DimObjectActionConstant.java | 2 + .../extract/FactAgencyGovernDailyEntity.java | 9 ++- .../extract/FactGridGovernDailyEntity.java | 11 +++ .../GovernGridClosedTotalCommonDTO.java | 3 + .../FactAgencyGovernDailyServiceImpl.java | 81 ++++++++++--------- .../impl/FactGridGovernDailyServiceImpl.java | 66 ++++++++++----- .../extract/FactOriginProjectLogDailyDao.xml | 69 ++++++---------- .../extract/FactOriginProjectMainDailyDao.xml | 22 +++-- 13 files changed, 200 insertions(+), 116 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java index d709731f77..77bcd7cc34 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java @@ -151,6 +151,15 @@ public class FactAgencyGovernDailyEntity extends BaseEpmetEntity { */ private Integer inGroupTopicUnResolvedCount; + /** + * 11、当前组织内：来源于事件的项目：结案已解决数 + */ + private Integer eventResolvedCount; + /** + * 12、当前组织内：来源于事件的项目：结案无需解决数 + */ + private Integer eventUnResolvedCount; + /** * 未出当前网格的，结案项目数 */ @@ -171,4 +180,5 @@ public class FactAgencyGovernDailyEntity extends BaseEpmetEntity { */ private Integer districtDeptClosedCount; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index e2156dbadb..1d1fac390d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1186,13 +1186,20 @@ public class DataStatsServiceImpl implements DataStatsService { Integer streetClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getStreetClosedCount).sum(); //由区直部门结案的项目总数 Integer districtDeptClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getDistrictDeptClosedCount).sum(); - + Integer issueResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getIssueProjectResolvedCount).sum(); + Integer issueUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getIssueProjectUnResolvedCount).sum(); + Integer projectResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getApprovalProjectResolvedCount).sum(); + Integer projectUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getApprovalProjectUnResolvedCount).sum(); + Integer eventResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getEventResolvedCount).sum(); + Integer eventUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getEventUnResolvedCount).sum(); + Integer closedProjectTotal = issueResolvedCount + issueUnResolvedCount+projectResolvedCount + + projectUnResolvedCount + eventResolvedCount + eventUnResolvedCount; resultDTO.setProblemResolvedCount(problemResolvedCount); resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount)); - resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, problemResolvedCount)); - resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, problemResolvedCount)); - resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, problemResolvedCount)); - resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, problemResolvedCount)); + resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, closedProjectTotal)); + resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, closedProjectTotal)); + resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, closedProjectTotal)); + resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, closedProjectTotal)); return resultDTO; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index c625e19c9b..6b60501d4e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -675,7 +675,13 @@ GRID_SELF_GOVERN_PROJECT_TOTAL, COMMUNITY_CLOSED_COUNT, STREET_CLOSED_COUNT, - DISTRICT_DEPT_CLOSED_COUNT + DISTRICT_DEPT_CLOSED_COUNT, + ISSUE_PROJECT_RESOLVED_COUNT, + ISSUE_PROJECT_UN_RESOLVED_COUNT, + APPROVAL_PROJECT_RESOLVED_COUNT, + APPROVAL_PROJECT_UN_RESOLVED_COUNT, + EVENT_RESOLVED_COUNT, + EVENT_UN_RESOLVED_COUNT FROM fact_agency_govern_daily WHERE diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactAgencyGovernDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactAgencyGovernDailyDTO.java index 3f9c614f8a..a550775779 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactAgencyGovernDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactAgencyGovernDailyDTO.java @@ -129,6 +129,15 @@ public class FactAgencyGovernDailyDTO implements Serializable { */ private Integer inGroupTopicUnResolvedCount; + /** + * 11、当前组织内：来源于事件的项目：结案已解决数 + */ + private Integer eventResolvedCount; + /** + * 12、当前组织内：来源于事件的项目：结案无需解决数 + */ + private Integer eventUnResolvedCount; + /** * 未出当前网格的，结案项目数 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactGridGovernDailyDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactGridGovernDailyDTO.java index 778ffcb9a4..b8d585f00f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactGridGovernDailyDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactGridGovernDailyDTO.java @@ -140,6 +140,15 @@ public class FactGridGovernDailyDTO implements Serializable { */ private Integer fromAgencyUnResolvedInGridCount; + /** + * 15、当前组织内：来源于事件的项目：结案已解决数 + */ + private Integer eventResolvedCount; + /** + * 16、当前组织内：来源于事件的项目：结案无需解决数 + */ + private Integer eventUnResolvedCount; + /** * 15、未出当前网格的，结案项目数=11+12+13+14 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java index 1b6697f1ec..6e8c7b153e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java @@ -24,4 +24,6 @@ public interface DimObjectActionConstant { // perfect 非常满意 // created 立项 String PROJECT_RETURN="return"; + + String PROJECT_CLOSE="close"; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java index 2f37f9a113..95f48fdeee 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactAgencyGovernDailyEntity.java @@ -150,7 +150,14 @@ public class FactAgencyGovernDailyEntity extends BaseEpmetEntity { * 10、当前组织内，未出小组即未转议题的：话题关闭无需解决数 */ private Integer inGroupTopicUnResolvedCount; - + /** + * 11、当前组织内：来源于事件的项目：结案已解决数 + */ + private Integer eventResolvedCount; + /** + * 12、当前组织内：来源于事件的项目：结案无需解决数 + */ + private Integer eventUnResolvedCount; /** * 未出当前网格的，结案项目数 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java index 22fa2b2b67..827a6fdf75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java @@ -169,6 +169,15 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity { */ private Integer gridSelfGovernProjectTotal; + /** + * 15、当前组织内：来源于事件的项目：结案已解决数 + */ + private Integer eventResolvedCount; + /** + * 16、当前组织内：来源于事件的项目：结案无需解决数 + */ + private Integer eventUnResolvedCount; + /** * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数 @@ -208,6 +217,8 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity { this.issueProjectUnResolvedCount=NumConstant.ZERO; this.approvalProjectResolvedCount=NumConstant.ZERO; this.approvalProjectUnResolvedCount=NumConstant.ZERO; + this.eventResolvedCount=NumConstant.ZERO; + this.eventUnResolvedCount=NumConstant.ZERO; this.inGroupTopicResolvedCount=NumConstant.ZERO; this.inGroupTopicUnResolvedCount=NumConstant.ZERO; this.fromIssueResolvedInGridCount=NumConstant.ZERO; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java index fcc4193885..d38e74cabb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java @@ -51,6 +51,8 @@ public class GovernGridClosedTotalCommonDTO implements Serializable { */ private Integer districtDeptClosedCount; + private Integer gridSelfGovernProjectTotal; + public GovernGridClosedTotalCommonDTO(){ this.gridId = StrConstant.EPMETY_STR; this.fromIssueResolvedInGridCount=NumConstant.ZERO; @@ -60,5 +62,6 @@ public class GovernGridClosedTotalCommonDTO implements Serializable { this.communityClosedCount=NumConstant.ZERO; this.streetClosedCount=NumConstant.ZERO; this.districtDeptClosedCount=NumConstant.ZERO; + this.gridSelfGovernProjectTotal=NumConstant.ZERO; } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java index f766873cea..52b6310caf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactAgencyGovernDailyServiceImpl.java @@ -29,7 +29,6 @@ import com.epmet.dto.stats.DimAgencyDTO; import com.epmet.entity.evaluationindex.extract.FactAgencyGovernDailyEntity; import com.epmet.service.evaluationindex.extract.todata.*; import com.epmet.service.stats.DimAgencyService; -import com.epmet.util.DimIdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -202,13 +201,11 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl projectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, dateId, ProjectConstant.RESOLVED, OrgTypeConstant.AGENCY); - Map eventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, - dateId, ProjectConstant.RESOLVED, - ProjectConstant.PROJECT_ORIGIN_EVENT); + if (!projectResolvedTotal.isEmpty()) { agencyGovernDailyList.forEach(item -> { OrgStatisticsResultDTO dto = projectResolvedTotal.get(item.getAgencyId()); @@ -219,23 +216,12 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl { - OrgStatisticsResultDTO dto = eventProjectResolvedTotal.get(item.getAgencyId()); - int sum = item.getApprovalProjectResolvedCount(); - if (null != dto) { - sum = sum + dto.getSum(); - } - item.setApprovalProjectResolvedCount(sum); - }); - } - // 当前组织内：来源于议题的项目：结案无需解决数 + + // 当前组织内：项目立项：结案无需解决数 Map projectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, dateId, ProjectConstant.UNRESOLVED, OrgTypeConstant.AGENCY); - Map eventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, - dateId, ProjectConstant.UNRESOLVED, - ProjectConstant.PROJECT_ORIGIN_EVENT); + if (!projectUnResolvedTotal.isEmpty()) { agencyGovernDailyList.forEach(item -> { OrgStatisticsResultDTO dto = projectUnResolvedTotal.get(item.getAgencyId()); @@ -246,17 +232,34 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl { - OrgStatisticsResultDTO dto = eventProjectUnResolvedTotal.get(item.getAgencyId()); - int sum = item.getApprovalProjectUnResolvedCount(); - if (null != dto) { - sum = sum + dto.getSum(); - } - item.setApprovalProjectUnResolvedCount(sum); - }); - } + + } + + //2021.12.15 当前组织内：来源于事件的项目：结案已解决数 + Map eventProjectResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, + dateId, ProjectConstant.RESOLVED, + ProjectConstant.PROJECT_ORIGIN_EVENT); + if (!eventProjectResolvedTotal.isEmpty()) { + agencyGovernDailyList.forEach(item -> { + OrgStatisticsResultDTO dto = eventProjectResolvedTotal.get(item.getAgencyId()); + if (null != dto) { + item.setEventResolvedCount(dto.getSum()); + } + }); } + //2021.12.15 当前组织内：来源于事件的项目：结案无需解决数 + Map eventProjectUnResolvedTotal = factOriginProjectMainDailyService.getAgencyClosedProjectCount(customerId, + dateId, ProjectConstant.UNRESOLVED, + ProjectConstant.PROJECT_ORIGIN_EVENT); + if (!eventProjectUnResolvedTotal.isEmpty()) { + agencyGovernDailyList.forEach(item -> { + OrgStatisticsResultDTO dto = eventProjectUnResolvedTotal.get(item.getAgencyId()); + if (null != dto) { + item.setEventUnResolvedCount(dto.getSum()); + } + }); + } + // 2.党群自治占比：当前组织下，所有小组内关闭（已解决+无需解决）的话题数与问题解决总数之比（未出小组：未转议题的） agencyGovernDailyList.forEach(item -> { int count = item.getInGroupTopicResolvedCount() + item.getInGroupTopicUnResolvedCount(); @@ -267,14 +270,16 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl gridSelfCount = factOriginProjectLogDailyService.getAgencyGridSelfDaily(customerId, dateId); if (!gridSelfCount.isEmpty()) { agencyGovernDailyList.forEach(item -> { OrgStatisticsResultDTO dto = gridSelfCount.get(item.getAgencyId()); if (null != dto) { int count = dto.getCount(); - int sum = item.getProblemResolvedCount(); + //已结案项目数 = 来源议题的项目结案已解决数+来源议题的项目结案无需解决数+项目立项结案已解决数+项目立项结案无需解决数+来源事件的项目结案已解决数+来源事件的项目结案已解决数 + int sum = item.getIssueProjectResolvedCount() + item.getIssueProjectUnResolvedCount() + item.getApprovalProjectResolvedCount() + + item.getApprovalProjectUnResolvedCount() + item.getEventResolvedCount() + item.getEventUnResolvedCount(); if (sum != NumConstant.ZERO) { BigDecimal resolveCount = new BigDecimal(sum); BigDecimal selfCount = new BigDecimal(count); @@ -284,9 +289,9 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl> projectCount = factOriginProjectMainDailyService.getAgencyClosedProjectStatic(customerId, dateId); if (!gridSelfCount.isEmpty()) { agencyGovernDailyList.forEach(item -> { @@ -294,7 +299,9 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl map = list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getLevel, Function.identity())); - int sum = item.getProblemResolvedCount(); + //已结案项目数 = 来源议题的项目结案已解决数+来源议题的项目结案无需解决数+项目立项结案已解决数+项目立项结案无需解决数+来源事件的项目结案已解决数+来源事件的项目结案已解决数 + int sum = item.getIssueProjectResolvedCount() + item.getIssueProjectUnResolvedCount() + item.getApprovalProjectResolvedCount() + + item.getApprovalProjectUnResolvedCount() + item.getEventResolvedCount() + item.getEventUnResolvedCount(); BigDecimal resolveCount = new BigDecimal(sum); if (sum != NumConstant.ZERO) { // 社区解决占比 @@ -316,7 +323,7 @@ public class FactAgencyGovernDailyServiceImpl extends BaseServiceImpl currentGridClosedProjectList = factOriginProjectMainDailyService.getGridClosedProjectList(customerId, gridId, ProjectConstant.CLOSED,null,null); @@ -339,6 +349,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl projectLogDTOList) { List handleLevelList=new ArrayList<>(); for (FactOriginProjectLogDailyDTO logDailyDTO : projectLogDTOList) { - if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)||NumConstant.ZERO==logDailyDTO.getIsActive()){ + if(!logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_CLOSE)||NumConstant.ZERO==logDailyDTO.getIsActive()){ //当前操作如果是退回，不参与比较 continue; } @@ -395,32 +409,42 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl @@ -40,7 +40,7 @@ left join screen_customer_agency pa on(agency.PARENT_AREA_CODE=pa.AREA_CODE and pa.DEL_FLAG='0') - left join screen_govern_rank_data rankData + left join screen_govern_rank_data_daily rankData ON (agency.AGENCY_ID =rankData.org_id AND rankData.DEL_FLAG = '0' and rankData.org_type='agency') @@ -50,7 +50,7 @@ #{orgId} - AND rankData.MONTH_ID =#{monthId} + AND rankData.DATE_ID =#{monthId} ) union ( @@ -65,7 +65,7 @@ FROM screen_customer_grid grid left join screen_customer_agency ca on (ca.agency_id = grid.parent_agency_id) - left join screen_govern_rank_data rankData + left join screen_govern_rank_data_daily rankData ON (grid.grid_id=rankData.org_id AND grid.DEL_FLAG = 0 and rankData.org_type='grid') @@ -74,7 +74,7 @@ #{orgId} - AND rankData.MONTH_ID =#{monthId} + AND rankData.DATE_ID =#{monthId} ) ORDER BY RESPONSE_RATIO DESC From 36a396afdae8f9c753967012960c4022ed728536 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 11:11:45 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=20=E4=BB=8E=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=8E=B7=E5=8F=96=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 50221188f9..3ae2108cd1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -599,6 +599,7 @@ public class EpmetUserServiceImpl implements EpmetUserService { log.error("getStaffInfo have any agency staffId:{}",staffId); return null; } + result.setStaffId(staffEntity.getUserId()); result.setAgencyId(agencyDTO.getId()); result.setAgencyName(agencyDTO.getOrganizationName()); result.setAgencyPIds(agencyDTO.getPids()); From 80b24f7d196f296f5e99bb0dee142187a7e1fb10 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 11:15:56 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=20=E4=BB=8E=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E8=8E=B7=E5=8F=96=202.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index fbb9ade0c5..e97ba4e662 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -608,7 +608,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Fri, 17 Dec 2021 12:28:14 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=92=8C=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9Eexcel=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserImportServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 9b50c237dd..f283ac5487 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -919,8 +919,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res */ public void downLoadResults(HttpServletResponse response) throws IOException { //public static final ThreadLocal>> errorRows = new ThreadLocal<>(); - - String fileName = "导入失败条目清单.xls"; + String fileName; + if (errorRows.get() == null || errorRows.get().size() == 0) { + fileName = "导入成功.xls"; + } else { + fileName = "导入失败条目清单.xls"; + } response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("content-Type", "application/vnd.ms-excel"); response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8")); From e2127015c5694340a0619e8eaadd3657b653038e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Dec 2021 12:49:54 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E8=B4=B9=E9=92=89=E9=92=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcBuildingServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index c1d5c440e3..ea85e2ce33 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -115,7 +115,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl getBuildingOptions(String neighborHoodId) { if (StringUtils.isBlank(neighborHoodId)) { - log.error("小区ID为空"); + log.warn("小区ID为空"); return Collections.emptyList(); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); From 55272711389ba4adc6f1be466cd8997e414cd885 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Dec 2021 13:42:37 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/dto/result/ProjectDifficultRankResultDTO.java | 7 +++++++ .../src/main/resources/mapper/project/ProjectDao.xml | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java index f3d1967599..0d6412a35d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectDifficultRankResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.project.dto.result; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -61,4 +62,10 @@ public class ProjectDifficultRankResultDTO implements Serializable { * */ private Integer handledCount; + /** + * 项目评价分数 + * 直接取整数位展示 + */ + private BigDecimal score; + } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index fced0091a6..a968be215b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -278,7 +278,8 @@ diff.EVENT_IMG_URL AS imgUrl, floor(diff.EVENT_COST_TIME/60) AS totalHours, diff.EVENT_RE_ORG AS reOrg, - diff.EVENT_HANDLED_COUNT AS handledCount + diff.EVENT_HANDLED_COUNT AS handledCount, + IFNULL(spd.SATISFACTION_SCORE,80) AS score FROM ( select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1 @@ -333,6 +334,7 @@ AND sdd2.EVENT_STATUS_CODE in('closed','10','5') ) diff + LEFT JOIN screen_project_data spd ON (spd.PROJECT_ID = diff.EVENT_ID AND spd.DEL_FLAG = '0' AND spd.CLOSE_CASE_TIME IS NOT NULL and spd.SATISFACTION_SCORE is not null) ORDER BY CASE #{type} WHEN 'timelongest' THEN diff.EVENT_COST_TIME WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT From 364955346a0bf9856c5984cdd9c7a358301e57e7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 13:44:17 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_info_cid_for_easy_excel.xls | Bin 45056 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xls deleted file mode 100644 index 9afbfdd669087f317eb2e9ab6d57f94ecab8cfd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45056 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 cz>$fA{n`M8**J1^Oxi&G{G! Date: Fri, 17 Dec 2021 13:46:26 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E5=BA=94=E8=83=A1=E7=A7=91=E5=AE=B6?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=B0=86=E5=B9=B3=E9=98=B4=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BD=91=E6=A0=BC=E5=91=98=E7=9A=84=E5=9C=A8?= =?UTF-8?q?=E6=94=B9=E5=9B=9E=E5=8E=BB=EF=BC=8C=E5=89=8D=E6=9C=9F=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=94=B9=E7=9A=84=E6=98=AF=E8=83=A1=E5=B0=8F=E9=9B=B7?= =?UTF-8?q?=E3=80=81=E6=9E=97=E4=BC=9F=E4=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/impl/UserAnalysisServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java index 7e7e2864dd..7b6e81d2e0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java @@ -200,13 +200,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("机关名："+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -333,13 +334,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("网格名："+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -507,13 +509,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { resultList.add(party); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { resultList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return resultList; } From 13bd6e4340af17165980fc9effcb4c26025e7cd2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Dec 2021 13:58:44 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectDao.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index a968be215b..61ac2de99a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -279,7 +279,12 @@ floor(diff.EVENT_COST_TIME/60) AS totalHours, diff.EVENT_RE_ORG AS reOrg, diff.EVENT_HANDLED_COUNT AS handledCount, - IFNULL(spd.SATISFACTION_SCORE,80) AS score + + spd.SATISFACTION_SCORE AS score + + + IFNULL(spd.SATISFACTION_SCORE,80) AS score + FROM ( select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1 From 70ac51304c6b3c2658e1e916297b6aeb63a7f703 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 17 Dec 2021 14:34:27 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9?= =?UTF-8?q?=E5=88=86=E6=95=B0=E4=BF=AE=E6=94=B9=20=E6=BB=A1=E6=84=8F?= =?UTF-8?q?=E5=BA=A6=E5=88=86=E6=95=B0=E9=BB=98=E8=AE=A4=E5=80=BC80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectDao.xml | 8 ++------ .../src/main/resources/mapper/project/ProjectDao.xml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml index 61ac2de99a..e0e3b9fdae 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml @@ -279,12 +279,8 @@ floor(diff.EVENT_COST_TIME/60) AS totalHours, diff.EVENT_RE_ORG AS reOrg, diff.EVENT_HANDLED_COUNT AS handledCount, - - spd.SATISFACTION_SCORE AS score - - - IFNULL(spd.SATISFACTION_SCORE,80) AS score - + CASE WHEN diff.org_type = 'grid' AND diff.EVENT_STATUS_CODE = 'closed' THEN IFNULL(spd.SATISFACTION_SCORE,80) + ELSE spd.SATISFACTION_SCORE END AS score FROM ( select scg.AREA_CODE,sdd1.* from screen_difficulty_data sdd1 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml index 85e8316cd3..9a2ec5b096 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml @@ -200,7 +200,7 @@ + s.PERFECT_COUNT * 100 )/s.SHOULD_EVALUATE_COUNT , - 0 + 80 ) AS score FROM project_satisfaction_statistics s From 22fa5550f7b6251762e4f0b9cf64f5cec0f2ef6d Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Dec 2021 15:51:16 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=B2=BB=E7=90=86=E6=8C=87=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectMainDailyDao.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index ff340e097c..f111a535eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -1069,7 +1069,7 @@ From 02002fe33ff468fa933d1de5ce5213513f986f98 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 17 Dec 2021 16:19:35 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91excel?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index f283ac5487..0b554c980e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -918,12 +918,21 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res * @throws IOException */ public void downLoadResults(HttpServletResponse response) throws IOException { - //public static final ThreadLocal>> errorRows = new ThreadLocal<>(); String fileName; - if (errorRows.get() == null || errorRows.get().size() == 0) { - fileName = "导入成功.xls"; - } else { + + // 判断是否有错误信息，以确定文件名 + boolean hasError = false; + Map> tableAndErrorRows = errorRows.get(); + for (Map.Entry> entry:tableAndErrorRows.entrySet()) { + if (entry.getValue().size() != 0) { + hasError = true; + } + } + + if (hasError) { fileName = "导入失败条目清单.xls"; + } else { + fileName = "导入成功.xls"; } response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); response.setHeader("content-Type", "application/vnd.ms-excel"); From 3e0b7a44347dd6c43677b812ca22176dfc465811 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Dec 2021 16:35:21 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E7=82=B9=E4=BD=8D=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/AgencyServiceImpl.java | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index e9747050e3..4fecffafe7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -19,7 +19,6 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -46,7 +45,6 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.CustomerAgencyRedis; -import com.epmet.send.SendMqMsgUtil; import com.epmet.service.AgencyService; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerOrgParameterService; @@ -547,14 +545,25 @@ public class AgencyServiceImpl implements AgencyService { formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setLevel(OrgInfoConstant.AGENCY); } + if (StringUtils.isNotBlank(customerAgencyEntity.getLatitude())){ + result.setLatitude(new BigDecimal(customerAgencyEntity.getLatitude())); + } + if (StringUtils.isNotBlank(customerAgencyEntity.getLongitude())){ + result.setLongitude(new BigDecimal(customerAgencyEntity.getLongitude())); + } if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)){ CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId()); result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class); result.setName(entity.getOrganizationName()); result.setLevel(formDTO.getLevel()); result.setAgencyLevel(entity.getLevel()); - result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude())); - result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude())); + //经纬度 如果本级没有则取根级组织的 根级没有就空着 + if (StringUtils.isNotBlank(entity.getLatitude()){ + result.setLatitude(new BigDecimal(entity.getLatitude())); + } + if (StringUtils.isNotBlank(entity.getLongitude()){ + result.setLongitude(new BigDecimal(entity.getLongitude())); + } if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){ List son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.GRID); if (CollectionUtils.isNotEmpty(son)){ @@ -576,12 +585,9 @@ public class AgencyServiceImpl implements AgencyService { if (CollectionUtils.isNotEmpty(directlySub)){ dtoList.addAll(directlySub); } - if (CollectionUtils.isNotEmpty(dtoList)){ - MapOrgResultDTO finalResult1 = result; - dtoList.forEach(d -> { - d.setLatitude(StringUtils.isBlank(d.getLatitudeOrigin()) ? finalResult1.getLatitude() : new BigDecimal(d.getLatitudeOrigin())); - d.setLongitude(StringUtils.isBlank(d.getLongitudeOrigin()) ? finalResult1.getLongitude() : new BigDecimal(d.getLongitudeOrigin())); - }); + for (MapSonOrgResultDTO d : dtoList) { + d.setLatitude(StringUtils.isBlank(d.getLatitudeOrigin()) ? result.getLatitude() : new BigDecimal(d.getLatitudeOrigin())); + d.setLongitude(StringUtils.isBlank(d.getLongitudeOrigin()) ? result.getLongitude() : new BigDecimal(d.getLongitudeOrigin())); } result.setChildren(dtoList); } @@ -591,15 +597,19 @@ public class AgencyServiceImpl implements AgencyService { result.setName(entity.getGridName()); result.setLevel(formDTO.getLevel()); result.setAgencyLevel(OrgInfoConstant.GRID); - result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude())); - result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude())); + //经纬度 如果本级没有则取根级组织的 根级没有就空着 + if (StringUtils.isNotBlank(entity.getLatitude()){ + result.setLatitude(new BigDecimal(entity.getLatitude())); + } + if (StringUtils.isNotBlank(entity.getLongitude()){ + result.setLongitude(new BigDecimal(entity.getLongitude())); + } List son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD); if (CollectionUtils.isNotEmpty(son)){ - MapOrgResultDTO finalResult2 = result; - son.forEach(s -> { - s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? finalResult2.getLatitude() : new BigDecimal(s.getLatitudeOrigin())); - s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? finalResult2.getLongitude() : new BigDecimal(s.getLongitudeOrigin())); - }); + for (MapSonOrgResultDTO s : son) { + s.setLatitude(StringUtils.isBlank(s.getLatitudeOrigin()) ? result.getLatitude() : new BigDecimal(s.getLatitudeOrigin())); + s.setLongitude(StringUtils.isBlank(s.getLongitudeOrigin()) ? result.getLongitude() : new BigDecimal(s.getLongitudeOrigin())); + } } result.setChildren(CollectionUtils.isEmpty(son) ? new ArrayList<>() : son); } @@ -671,4 +681,4 @@ public class AgencyServiceImpl implements AgencyService { return insertEntity; } -} \ No newline at end of file +}