From 20650c06ffca01a03a6dde6655f643cd0274de13 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 May 2021 17:36:14 +0800 Subject: [PATCH] =?UTF-8?q?advancedbranchrank=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/AdvanceBranchRankResultDTO.java | 2 ++ .../screen/dto/result/OrgRankDataResultDTO.java | 1 + .../screen/impl/PartyMemberLeadServiceImpl.java | 16 ++++++++++++---- .../mapper/screen/ScreenOrgRankDataDao.xml | 6 ++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java index 216214d05c..48c80b86dc 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java @@ -55,4 +55,6 @@ public class AdvanceBranchRankResultDTO implements Serializable { */ private String parentAgencyName; + private Integer sort; + private String orgId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java index a52b035475..fa37c1f731 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java @@ -56,4 +56,5 @@ public class OrgRankDataResultDTO implements Serializable { */ private String parentAgencyName; + private String orgId; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index bfa4f721e9..150bde5417 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java @@ -282,12 +282,16 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { gridData = screenOrgRankDataDao.selectGridDataMonthlyAreaCode(monthId,param.getAreaCode()); } if(null == gridData || gridData.isEmpty()) return result; - gridData.forEach( data -> { + int num=1; + for(OrgRankDataResultDTO data:gridData){ AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class); o.setClosedProjectRatio(convertPercentStr(data.getClosedProjectRatio())); o.setSatisfactionRatio(convertPercentStr(data.getSatisfactionRatio())); + o.setSort(num); + o.setOrgId(data.getOrgId()); + num++; result.add(o); - }); + }; }else{ List gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId); @@ -299,12 +303,16 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId); } if(null == gridData || gridData.isEmpty()) return result; - gridData.forEach( data -> { + int num=1; + for(OrgRankDataResultDTO data:gridData){ AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class); o.setClosedProjectRatio(convertPercentStr(data.getClosedProjectRatio())); o.setSatisfactionRatio(convertPercentStr(data.getSatisfactionRatio())); + o.setSort(num); + o.setOrgId(data.getOrgId()); + num++; result.add(o); - }); + }; } return result; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml index 5d2be597be..6c176721d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataDao.xml @@ -13,7 +13,8 @@ rankData.PROJECT_TOTAL AS projectNum, rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio, rankData.SATISFACTION_RATIO AS satisfactionRatio, - agency.AGENCY_NAME AS parentAgencyName + agency.AGENCY_NAME AS parentAgencyName, + rankData.ORG_ID as orgId FROM screen_org_rank_data rankData LEFT JOIN screen_customer_agency agency @@ -43,7 +44,8 @@ rankData.PROJECT_TOTAL AS projectNum, rankData.CLOSE_PROJECT_RATIO AS closedProjectRatio, rankData.SATISFACTION_RATIO AS satisfactionRatio, - agency.AGENCY_NAME AS parentAgencyName + agency.AGENCY_NAME AS parentAgencyName, + rankData.ORG_ID as orgId FROM screen_org_rank_data rankData left join screen_customer_grid scg on(