/workrecord/ranklist接口调整

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/plugins/ScreenWorkRecordOrgDailyDao.java

@@ -62,7 +62,10 @@ public interface ScreenWorkRecordOrgDailyDao extends BaseDao<ScreenWorkRecordOrg
     List<String> selectCustomerTypeCode(@Param("dataType")String dataType, @Param("customerId")String customerId);
 
 
-    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId, @Param("dateId")String dateId,@Param("typeCodeList") List<String> typeCodeList);
+    WorkRecordSubRank selectUpToCalAgency(@Param("agencyId")String agencyId,
+                                          @Param("agencyName")String agencyName,
+                                          @Param("dateId")String dateId,
+                                          @Param("typeCodeList") List<String> typeCodeList);
 
     WorkRecordSubRank selectUpToCalGrid(@Param("gridId")String gridId, @Param("dateId")String dateId, @Param("typeCodeList")List<String> typeCodeList);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

@@ -116,8 +116,9 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         //2）、下级所有组织
         List<WorkRecordSubRank> subAgencyRankList = new ArrayList<>();
         for(ScreenCustomerAgencyCommonDTO agencyCommonDTO:agencyInfoDTO.getSubAgencies()){
-            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),dateId,typeCodeList);
+            WorkRecordSubRank agencyRes= baseDao.selectUpToCalAgency(agencyCommonDTO.getAgencyId(),agencyCommonDTO.getAgencyName(),dateId,typeCodeList);
             if(null !=agencyRes){
+                agencyRes.setIsDefault("no");
                 subAgencyRankList.add(agencyRes);
             }else{
                 WorkRecordSubRank agencyDefault=new WorkRecordSubRank();
@@ -135,6 +136,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         for(ScreenCustomerGridCommonDTO gridCommonDTO:agencyInfoDTO.getSubGrids()){
             WorkRecordSubRank gridRes=baseDao.selectUpToCalGrid(gridCommonDTO.getGridId(),dateId,typeCodeList);
             if (null != gridRes) {
+                gridRes.setIsDefault("no");
                 subGridList.add(gridRes);
             } else {
                 WorkRecordSubRank gridResDefault = new WorkRecordSubRank();

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -109,8 +109,8 @@
 
     <select id="selectUpToCalAgency" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            sca.AGENCY_ID AS orgId,
+            #{agencyId} as orgId
-            sca.AGENCY_NAME AS `NAME`,
+            #{agencyName} AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM