Merge remote-tracking branch 'origin/dev'

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;
 }

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;
 }

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<OrgRankDataResultDTO> 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;
     }

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(