From 63ca74ab2c31e21129b1f65de53c32c44271d320 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 13 Jul 2021 17:12:27 +0800
Subject: [PATCH] zancun

---
 .../main/java/com/epmet/plugins/result/WorkRecordSubRank.java | 2 ++
 .../plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordSubRank.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordSubRank.java
index 91f3d027e9..84776cf8b1 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordSubRank.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/plugins/result/WorkRecordSubRank.java
@@ -31,4 +31,6 @@ public class WorkRecordSubRank implements Serializable {
      * 组织次数
      */
     private Integer participateTotal;
+
+    private String isDefault;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
index e1670ecc40..52de467168 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
@@ -103,7 +103,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
         String dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
         WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
-        // log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
+        log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
 
         //随手记类型编码；对应screen_customer_work_record_dict的资源编码
         List<String> typeCodeList=baseDao.selectCustomerTypeCode(formDTO.getDataType(),formDTO.getCustomerId());
@@ -125,6 +125,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
                 agencyDefault.setName(agencyCommonDTO.getAgencyName());
                 agencyDefault.setParticipateTotal(0);
                 agencyDefault.setParticipateUserTotal(0);
+                agencyDefault.setIsDefault("yes");
                 subAgencyRankList.add(agencyDefault);
             }
 
@@ -141,6 +142,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
                 gridResDefault.setName(gridCommonDTO.getGridName());
                 gridResDefault.setParticipateTotal(0);
                 gridResDefault.setParticipateUserTotal(0);
+                gridResDefault.setIsDefault("yes");
                 subAgencyRankList.add(gridResDefault);
             }
         }