Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/BaseDataFormDTO.java

@@ -17,9 +17,9 @@ public class BaseDataFormDTO implements Serializable {
     /**
      * 组织Id
      */
-    @NotBlank(message = "组织ID不能为空",groups = {BaseDataFormDTO.BaseData.class,BaseDataFormDTO.WorkFact.class})
+    @NotBlank(message = "组织ID不能为空",groups = {BaseDataFormDTO.BaseData.class, AgencyIdAndLevel.class})
     private String agencyId;
-    @NotBlank(message = "组织级别不能为空",groups = BaseDataFormDTO.WorkFact.class)
+    @NotBlank(message = "组织级别不能为空",groups = AgencyIdAndLevel.class)
     private String agencyLevel;
     private String type;
     /**
@@ -29,6 +29,6 @@ public class BaseDataFormDTO implements Serializable {
     private String startDateId;
     private String endDateId;
     public interface BaseData extends CustomerClientShowGroup{}
-    public interface WorkFact extends CustomerClientShowGroup{}
+    public interface AgencyIdAndLevel extends CustomerClientShowGroup{}
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java

@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:
+ *
+ * @author: LiuJanJun
+ * @date: 2021/8/8 11:01 上午
+ * @version: 1.0
+ */
+@Data
+public class PatrolDailySumResult implements Serializable {
+    private static final long serialVersionUID = 310405655189243944L;
+
+    private String fullAgencyId;
+    private Integer patrolTotal;
+    private Integer totalTime;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/evaluationindex/ScreenCustomerAgencyDTO.java

@@ -23,6 +23,11 @@ public class ScreenCustomerAgencyDTO implements Serializable {
      */
     private String agencyId;
 
+    /**
+     * pids
+     */
+    private String pids;
+
     /**
      * 组织名称
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/pub/PubController.java

@@ -3,19 +3,20 @@ package com.epmet.dataaggre.controller.pub;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.datastats.form.BaseDataFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubTopicAndGroupFormDTO;
-import com.epmet.dataaggre.dto.datastats.form.SubUserTotalFormDTO;
 import com.epmet.dataaggre.dto.datastats.result.BaseStatsDataResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.SubTopicAndGroupResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.SubUserTotalResultDTO;
 import com.epmet.dataaggre.dto.datastats.result.WorkFactResultDTO;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -24,6 +25,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2021/7/27 18:36
  */
+@Log4j
 @RestController
 @RequestMapping("pub")
 public class PubController {
@@ -41,7 +43,8 @@ public class PubController {
     @PostMapping("baseDataAgg")
     public Result<BaseStatsDataResultDTO> getBaseStatsData(@RequestBody BaseDataFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.BaseData.class);
-        return new Result<BaseStatsDataResultDTO>().ok(dataStatsService.getBaseStatsData(formDTO));
+        BaseStatsDataResultDTO baseStatsData = dataStatsService.getBaseStatsData(formDTO);
+        return new Result<BaseStatsDataResultDTO>().ok(baseStatsData);
     }
 
     /**
@@ -54,8 +57,9 @@ public class PubController {
      */
     @PostMapping("subWorkFact")
     public Result<List<WorkFactResultDTO>> getSubWorkFact(@RequestBody BaseDataFormDTO formDTO){
-        ValidatorUtils.validateEntity(formDTO,BaseDataFormDTO.WorkFact.class);
-        return new Result<List<WorkFactResultDTO>>().ok(dataStatsService.getSubWorkFact(formDTO));
+        ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class);
+        List<WorkFactResultDTO> subWorkFact = dataStatsService.getSubWorkFact(formDTO);
+        return new Result<List<WorkFactResultDTO>>().ok(subWorkFact);
     }
 
     /**
@@ -64,9 +68,10 @@ public class PubController {
      * @author sun
      */
     @PostMapping("subUserTotal")
-    public Result<List<SubUserTotalResultDTO>> subUserTotal(@RequestBody SubUserTotalFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, SubUserTotalFormDTO.Agency.class);
-        return new Result<List<SubUserTotalResultDTO>>().ok(dataStatsService.subUserTotal(formDTO));
+    public Result<List<SubUserTotalResultDTO>> subUserTotal(@RequestBody BaseDataFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class);
+        List<SubUserTotalResultDTO> data = dataStatsService.subUserTotal(formDTO);
+        return new Result<List<SubUserTotalResultDTO>>().ok(data);
     }
 
     /**
@@ -75,9 +80,39 @@ public class PubController {
      * @author sun
      */
     @PostMapping("subTopicAndGroup")
-    public Result<List<SubTopicAndGroupResultDTO>> subTopicAndGroup(@RequestBody SubTopicAndGroupFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, SubTopicAndGroupFormDTO.Agency.class);
-        return new Result<List<SubTopicAndGroupResultDTO>>().ok(dataStatsService.subTopicAndGroup(formDTO));
+    public Result<List<SubTopicAndGroupResultDTO>> subTopicAndGroup(@RequestBody BaseDataFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, BaseDataFormDTO.AgencyIdAndLevel.class);
+        List<SubTopicAndGroupResultDTO> data = dataStatsService.subTopicAndGroup(formDTO);
+        return new Result<List<SubTopicAndGroupResultDTO>>().ok(data);
+    }
+
+    /**
+     * 导出数据，使用map接收
+     *
+     * @param map
+     * @param response
+     * @throws IOException
+     */
+    @PostMapping("/exportExcel")
+    public void exportExcel(@RequestBody BaseDataFormDTO formDTO, HttpServletResponse response) throws IOException {
+       /* try {
+            Map<String, Object> mapData = new HashMap<>();
+            BaseStatsDataResultDTO baseStatsData = dataStatsService.getBaseStatsData(formDTO);
+            String templatePath = "excel/trace_temp.xlsx";
+            log.info("exportExcel templatePath:{}",templatePath);
+            mapData.put("dataType", baseStatsData);
+
+            start = System.currentTimeMillis();
+            Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath, "数据汇总"), baseStatsData);
+            //header
+            response.setHeader("content-Type", "application/vnd.ms-excel");
+            response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("继续追踪导出详情-".concat(DateUtils.formatDate()) + ".xlsx", "UTF-8"));
+            //加密
+            log.error("excelExport  build wb cost:{}",System.currentTimeMillis()-start);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }*/
+
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StatsStaffPatrolRecordDailyDao.java

@@ -19,6 +19,7 @@ package com.epmet.dataaggre.dao.epmetuser;
 
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,10 +37,10 @@ public interface StatsStaffPatrolRecordDailyDao extends BaseDao<StatsStaffPatrol
 
     /**
      * desc:获取巡查次数和时间
-     * @param agencyList
+     * @param agencyFullIdList
      * @param startDateId
      * @param endDateId
      * @return
      */
-    List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(@Param("agencyList") List<String> agencyList, @Param("startDateId") String startDateId, @Param("endDateId") String endDateId);
+    List<PatrolDailySumResult> getPatrolSumList(@Param("agencyFullIdList") List<String> agencyFullIdList, @Param("startDateId") String startDateId, @Param("endDateId") String endDateId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -200,13 +200,15 @@ public interface DataStatsService {
      * @Param formDTO
      * @Description 对外接口--查询下级用户党员数
      * @author sun
+     * @param formDTO
      */
-    List<SubUserTotalResultDTO> subUserTotal(SubUserTotalFormDTO formDTO);
+    List<SubUserTotalResultDTO> subUserTotal(BaseDataFormDTO formDTO);
 
     /**
      * @Param formDTO
      * @Description 对外接口--查询下级话题和小组数
      * @author sun
+     * @param formDTO
      */
-    List<SubTopicAndGroupResultDTO> subTopicAndGroup(SubTopicAndGroupFormDTO formDTO);
+    List<SubTopicAndGroupResultDTO> subTopicAndGroup(BaseDataFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -11,6 +11,7 @@ import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
 import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
 import com.epmet.dataaggre.dto.datastats.form.*;
 import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
 import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
@@ -19,7 +20,6 @@ import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
 import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
 import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
 import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
-import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
@@ -1538,8 +1538,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             Map<String, Integer> closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             Map<String, Integer> closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubGridProjectResultDTO::getGridId, SubGridProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             //巡查次数和时间
-            List<StatsStaffPatrolRecordDailyEntity> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,formDTO.getStartDateId(),formDTO.getEndDateId());
-            Map<String, StatsStaffPatrolRecordDailyEntity> patrolListMap = patrolList.stream().collect(Collectors.toMap(StatsStaffPatrolRecordDailyEntity::getAgencyId, o -> o, (o1, o2) -> o1));
+            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(gridIdList,formDTO.getStartDateId(),formDTO.getEndDateId());
+            Map<String, PatrolDailySumResult> patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
 
             subAgencyList.forEach(agency->{
                 String gridId = agency.getGridId();
@@ -1549,7 +1549,8 @@ public class DataStatsServiceImpl implements DataStatsService {
                 resultDTO.setTopicToIssueTotal(getTotal(toIssueStartMap,toIssueEndMap,gridId));
                 resultDTO.setIssueToProjectTotal(getTotal(toProjectStartMap,toProjectEndMap,gridId));
                 resultDTO.setClosedProjectTotal(getTotal(closeProjectStartMap,closeProjectEndMap,gridId));
-                StatsStaffPatrolRecordDailyEntity patrolRecordDTO = patrolListMap.get(gridId);
+
+                PatrolDailySumResult patrolRecordDTO = patrolListMap.get(agency.getAllParentIds());
                 if (patrolRecordDTO != null){
                     resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal());
                     Integer totalTime = patrolRecordDTO.getTotalTime();
@@ -1583,8 +1584,9 @@ public class DataStatsServiceImpl implements DataStatsService {
             Map<String, Integer> closeProjectStartMap = closeProjectStart.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             Map<String, Integer> closeProjectEndMap = closeProjectEnd.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, SubAgencyProjectResultDTO::getClosedProjectTotal, (o1, o2) -> o1));
             //巡查次数和时间
-            List<StatsStaffPatrolRecordDailyEntity> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyList,formDTO.getStartDateId(),formDTO.getEndDateId());
-            Map<String, StatsStaffPatrolRecordDailyEntity> patrolListMap = patrolList.stream().collect(Collectors.toMap(StatsStaffPatrolRecordDailyEntity::getAgencyId, o -> o, (o1, o2) -> o1));
+            List<String> agencyFullIds = subAgencyList.stream().map(o -> o.getPids().concat(o.getAgencyId())).collect(Collectors.toList());
+            List<PatrolDailySumResult> patrolList = statsStaffPatrolRecordDailyService.getPatrolSumList(agencyFullIds,formDTO.getStartDateId(),formDTO.getEndDateId());
+            Map<String, PatrolDailySumResult> patrolListMap = patrolList.stream().collect(Collectors.toMap(PatrolDailySumResult::getFullAgencyId, o -> o, (o1, o2) -> o1));
 
             subAgencyList.forEach(agency->{
                 String agencyId = agency.getAgencyId();
@@ -1594,7 +1596,8 @@ public class DataStatsServiceImpl implements DataStatsService {
                 resultDTO.setTopicToIssueTotal(getTotal(toIssueStartMap,toIssueEndMap,agencyId));
                 resultDTO.setIssueToProjectTotal(getTotal(toProjectStartMap,toProjectEndMap,agencyId));
                 resultDTO.setClosedProjectTotal(getTotal(closeProjectStartMap,closeProjectEndMap,agencyId));
-                StatsStaffPatrolRecordDailyEntity patrolRecordDTO = patrolListMap.get(agencyId);
+                String fullAgencyId = agency.getPids().concat(agencyId);
+                PatrolDailySumResult patrolRecordDTO = patrolListMap.get(fullAgencyId);
                 if (patrolRecordDTO != null){
                     resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal());
                     Integer totalTime = patrolRecordDTO.getTotalTime();
@@ -1633,9 +1636,10 @@ public class DataStatsServiceImpl implements DataStatsService {
      * @Param formDTO
      * @Description 对外接口--查询下级用户党员数
      * @author sun
+     * @param formDTO
      */
     @Override
-    public List<SubUserTotalResultDTO> subUserTotal(SubUserTotalFormDTO formDTO) {
+    public List<SubUserTotalResultDTO> subUserTotal(BaseDataFormDTO formDTO) {
         List<SubUserTotalResultDTO> resultList = new ArrayList<>();
         //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {
@@ -1710,9 +1714,10 @@ public class DataStatsServiceImpl implements DataStatsService {
      * @Param formDTO
      * @Description 对外接口--查询下级话题和小组数
      * @author sun
+     * @param formDTO
      */
     @Override
-    public List<SubTopicAndGroupResultDTO> subTopicAndGroup(SubTopicAndGroupFormDTO formDTO) {
+    public List<SubTopicAndGroupResultDTO> subTopicAndGroup(BaseDataFormDTO formDTO) {
         List<SubTopicAndGroupResultDTO> resultList = new ArrayList<>();
         //1.入参有日期的则按具体时间执行,没有的则按当前时间前一天执行
         if (StringUtils.isBlank(formDTO.getDateId())) {

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/StatsStaffPatrolRecordDailyService.java

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.service.epmetuser;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 
 import java.util.List;
@@ -37,6 +38,6 @@ public interface StatsStaffPatrolRecordDailyService extends BaseService<StatsSta
      * @param endDateId
      * @return
      */
-	List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId);
+	List<PatrolDailySumResult> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId);
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/StatsStaffPatrolRecordDailyServiceImpl.java

@@ -4,6 +4,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao;
+import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult;
 import com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity;
 import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService;
 import lombok.extern.slf4j.Slf4j;
@@ -25,19 +26,14 @@ public class StatsStaffPatrolRecordDailyServiceImpl extends BaseServiceImpl<Stat
     /**
      * desc:获取组织或网格的 时间段内的总次数等
      *
-     * @param agencyList
+     * @param agencyFullIdList
      * @param startDateId
      * @param endDateId
      * @return
      */
     @Override
-    public List<StatsStaffPatrolRecordDailyEntity> getPatrolSumList(List<String> agencyList, String startDateId, String endDateId) {
-       /* LambdaQueryWrapper<StatsStaffPatrolRecordDailyEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StatsStaffPatrolRecordDailyEntity::getDelFlag, NumConstant.ZERO_STR)
-                .between(StatsStaffPatrolRecordDailyEntity::getDateId, startDateId,endDateId)
-                .in(StatsStaffPatrolRecordDailyEntity::getAgencyId, agencyList)
-                ;*/
-        return baseDao.getPatrolSumList(agencyList,startDateId,endDateId);
+    public List<PatrolDailySumResult> getPatrolSumList(List<String> agencyFullIdList, String startDateId, String endDateId) {
+        return baseDao.getPatrolSumList(agencyFullIdList,startDateId,endDateId);
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -714,10 +714,10 @@
     </select>
     <select id="getAgencySumProject" resultType="com.epmet.dataaggre.dto.datastats.result.TotalAndIncrResultDTO">
          SELECT
-            IFNULL(project_total, 0) AS total,
-            IFNULL(PROJECT_INCR, 0) AS incr,
-            IFNULL(CLOSED_TOTAL, 0) AS total2,
-            IFNULL(CLOSED_INCR, 0) AS incr2
+            SUM(project_total) AS total,
+            SUM(PROJECT_INCR) AS incr,
+            SUM(CLOSED_TOTAL) AS total2,
+            SUM(CLOSED_INCR) AS incr2
         FROM
             fact_agency_project_daily
         WHERE
@@ -738,7 +738,7 @@
         del_flag = '0'
         AND topic_status_id in('discussing','closed','hidden')<!-- 讨论中(热议中！=讨论中)、已处理、已屏蔽 -->
         AND date_id = #{dateId}
-        <foreach item="agencyId" collection="agencyIds" open="AND (" separator="or" close=")" index="">
+        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
             agency_id = #{agencyId}
         </foreach>
     </select>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.epmet.dataaggre.dao.epmetuser.StatsStaffPatrolRecordDailyDao">
-    <select id="getPatrolSumList" resultType="com.epmet.dataaggre.entity.epmetuser.StatsStaffPatrolRecordDailyEntity">
+    <select id="getPatrolSumList" resultType="com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult">
+    <foreach collection="agencyFullIdList" item="fullAgencyId" separator="UNION ALL">
         SELECT
-            agency_id,
+            LEFT (GRID_PIDS,LENGTH( ${fullAgencyId} )) fullAgencyId,
             sum(patrol_total) patrolTotal,
             sum(TOTAL_TIME) totalTime
         FROM stats_staff_patrol_record_daily
         WHERE del_flag = '0'
         AND date_id BETWEEN #{startDateId} and #{endDateId}
-        <foreach item="agencyId" collection="agencyList" open="AND (" separator="or" close=")" index="">
-            agency_id = #{agencyId}
-        </foreach>
-        GROUP BY customer_id,agency_id
+        AND GRID_PIDS like CONCAT( #{fullAgencyId},'%')
+        GROUP BY fullAgencyId
+    </foreach>
+
     </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml

@@ -154,7 +154,8 @@
             agency_name AS agencyName,
             level AS level,
             area_code AS areaCode,
-            parent_area_code AS parentAreaCode
+            parent_area_code AS parentAreaCode,
+            PIDS
         FROM
             screen_customer_agency
         WHERE
@@ -174,4 +175,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>