diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
index 2cf28aca5a..1ed8a24261 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java
@@ -19,6 +19,7 @@ import com.epmet.screen.dto.form.VolunteerServiceFormDTO;
 import com.epmet.screen.dto.result.*;
 import com.epmet.screen.constant.*;
 import com.github.pagehelper.PageHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -126,6 +127,13 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         List<Integer> joinData = new ArrayList<>();
         List<Integer> averageJoinUserData = new ArrayList<>();
         result.setXAxis(this.getXPro());
+        //创建缺省值对象
+        VolunteerServiceResult defaultObj = new VolunteerServiceResult();
+        defaultObj.setAverageJoinUserData(NumConstant.ZERO);
+        defaultObj.setJoinData(NumConstant.ZERO);
+        defaultObj.setOrganizeData(NumConstant.ZERO);
+
+        //倒叙取十二个月的数据，从本月开始，有可能取不到十二条，要对X轴空白的缺口进行填补
         List<VolunteerServiceResult> volunteerServiceResults = screenPartyBranchDataDao.selectVolunteerServiceResult(volunteerServiceFormDTO.getAgencyId());
         if (volunteerServiceResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
@@ -138,16 +146,33 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
             result.setAverageJoinUserData(averageJoinUserData);
             return result;
         }
+
+        Set<String> yyyyMMList = dateUtils.getXpro().keySet();
+        yyyyMMList.forEach(mm -> {
+            Optional<VolunteerServiceResult> opt = volunteerServiceResults.stream()
+                    .filter(obj -> StringUtils.equals(mm,obj.getMonthId())).findAny();
+            VolunteerServiceResult find = opt.isPresent() ? opt.get() : defaultObj;
+            //VolunteerServiceResult find = Optional.ofNullable(opt.isPresent() ? opt.get() : null).orElse(defaultObj);
+            organizeData.add(find.getOrganizeData());
+            joinData.add(find.getJoinData());
+            averageJoinUserData.add(find.getAverageJoinUserData());
+        });
+
+
+        /*
         List<VolunteerServiceResult> collect = volunteerServiceResults.stream().sorted(Comparator.comparing(VolunteerServiceResult::getMonthId)).collect(Collectors.toList());
         collect.forEach(volunteer -> {
             organizeData.add(volunteer.getOrganizeData());
             joinData.add(volunteer.getJoinData());
             averageJoinUserData.add(volunteer.getAverageJoinUserData());
         });
+        */
+
+
         result.setOrganizeData(organizeData);
         result.setJoinData(joinData);
         result.setAverageJoinUserData(averageJoinUserData);
-        String bottomMonthId = collect.get(NumConstant.ZERO).getMonthId();
+        String bottomMonthId = yyyyMMList.iterator().next();
         //总组织次数
         Integer totalOrganizationCount = screenPartyBranchDataDao.selectTotalOrganizationCount(ModuleConstant.KEY_BRANCH_CATEGORY_VOLUNTARY_SERVICE,ModuleConstant.PARAM_BRANCH_DATA_TYPE_ORGAN,volunteerServiceFormDTO.getAgencyId(),bottomMonthId);
         //总参与人数
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
index 013f43c74b..2b20c44880 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml
@@ -72,14 +72,16 @@
     <select id="selectVolunteerServiceResult" resultType="com.epmet.screen.dto.result.VolunteerServiceResult">
         SELECT
             month_id AS monthId,
-            organize_count AS organizeData,
-            join_user_count AS joinData,
-            average_join_user_count AS averageJoinUserData
+            SUM(organize_count) AS organizeData,
+            SUM(join_user_count) AS joinData,
+            SUM(average_join_user_count) AS averageJoinUserData
         FROM
             screen_party_branch_data
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
+            AND type = 'voluntaryservice'
+            GROUP BY MONTH_ID
             ORDER BY MONTH_ID DESC
             LIMIT 12
     </select>
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
index 0cfcdcc2a7..aff436ff3d 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/IndexCalConstant.java
@@ -15,4 +15,6 @@ public interface IndexCalConstant {
     String CUSTOMER_ID="CUSTOMER_ID";
 
     String MONTH_ID="MONTH_ID";
+
+    String USER_ID="USER_ID";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
index f9c0ad1af2..cdecd48f51 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/indexcoll/FactIndexPartyAblityCpcMonthlyDao.java
@@ -23,7 +23,6 @@ import com.epmet.entity.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -70,7 +69,7 @@ public interface FactIndexPartyAblityCpcMonthlyDao extends BaseDao<FactIndexPart
     void batchInsertFactIndexPartyAblityCpcMonthly(@Param("list") List<GridPartyMemberDataFormDTO> list,
                                                    @Param("customerId") String customerId);
 
-    Map<String,BigDecimal> getCountByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId);
+    List<Map<String, Object>> getCountByMonthId(@Param("customerId") String customerId, @Param("monthId") String monthId, @Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
 
-    Map<String, BigDecimal> getExtremeValue(@Param("customerId") String customerId);
+    Map<String, Object> getExtremeValue(@Param("customerId") String customerId);
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/IndexGroupDetailDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/IndexGroupDetailDao.java
index 8c7a4e82fb..8982bc5f29 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/IndexGroupDetailDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/IndexGroupDetailDao.java
@@ -34,4 +34,6 @@ import java.util.List;
 public interface IndexGroupDetailDao extends BaseDao<IndexGroupDetailEntity> {
 
     List<IndexGroupDetailEntity> getDetailListByParentCode(@Param("customerId") String customerId, @Param("indexCode") String indexCode);
+
+    List<IndexGroupDetailEntity> getDetailListLikeParentCode(@Param("customerId") String customerId, @Param("parentIndexCode") String parentIndexCode);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
index 0367e90137..521c9dd631 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java
@@ -1,6 +1,8 @@
 package com.epmet.service.indexcal.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.indexcoll.FactIndexPartyAblityCpcMonthlyDao;
 import com.epmet.dao.screen.IndexCodeFieldReDao;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
@@ -9,14 +11,26 @@ import com.epmet.eum.IndexCodeEnum;
 import com.epmet.service.indexcal.CpcIndexCalculateService;
 import com.epmet.service.indexcal.IndexCodeFieldReService;
 import com.epmet.service.screen.IndexGroupDetailService;
+import com.epmet.support.normalizing.BigDecimalScoreCalculator;
+import com.epmet.support.normalizing.Correlation;
+import com.epmet.support.normalizing.ScoreCalculator;
+import com.epmet.support.normalizing.ScoreConstants;
+import com.epmet.support.normalizing.batch.BatchScoreCalculator;
+import com.epmet.support.normalizing.batch.IndexInputVO;
+import com.epmet.support.normalizing.batch.SampleValue;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -29,35 +43,144 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
     private IndexGroupDetailService getDetailListByParentCode;
     @Autowired
     private IndexCodeFieldReService indexCodeFieldReService;
+
     @Override
     public Boolean cpcIndexCalculate(CalculateCommonFormDTO formDTO) {
-        //计算最大最小值
-        Map<String, BigDecimal> minAndMaxList = factIndexPartyAblityCpcMonthlyDao.getExtremeValue(formDTO.getCustomerId());
-        if (CollectionUtils.isEmpty(minAndMaxList)){
-            log.warn("cpcIndexCalculate customerId:{} have not any fact record",formDTO.getCustomerId());
-            return false;
-        }
-        //获取指标权重信息
-        List<IndexGroupDetailEntity> indexDetails = getDetailListByParentCode.getDetailListByParentCode(formDTO.getCustomerId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode(),IndexCodeEnum.CAN_YU_YI_SHI.getCode());
-        if (CollectionUtils.isEmpty(indexDetails)){
-            log.warn("cpcIndexCalculate customerId:{} have not any indexGroupDetail",formDTO.getCustomerId());
+
+        //获取指标权重信息 -参与议事
+        List<IndexGroupDetailEntity> indexDetails = getDetailListByParentCode.getDetailListLikeParentCode(formDTO.getCustomerId(), IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
+        if (CollectionUtils.isEmpty(indexDetails)) {
+            log.warn("cpcIndexCalculate customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
             return false;
         }
+
+        canyuyishi(formDTO, indexDetails);
+
+        //log.info(JSON.toJSONString(minAndMaxList));
+        return null;
+    }
+
+    private void canyuyishi(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexDetails) {
         Map<String, String> indexCodeFieldReList = indexCodeFieldReService.getIndexCodeFieldReMap();
-        if (CollectionUtils.isEmpty(indexCodeFieldReList)){
-            log.warn("cpcIndexCalculate have any indexcodefieldre");
-            return false;
+        if (CollectionUtils.isEmpty(indexCodeFieldReList)) {
+            log.error("cpcIndexCalculate have any indexcodefieldre");
+            return;
         }
-        String indexCode = null;
-        String fieldName = null;
-        for (IndexGroupDetailEntity indexDetail : indexDetails) {
-            indexCode = indexDetail.getIndexCode();
-            fieldName = indexCodeFieldReService.getFieldNameByIndexCode(indexCode);
-
+        //计算最大最小值
+        Map<String, Object> minAndMaxMap = factIndexPartyAblityCpcMonthlyDao.getExtremeValue(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(minAndMaxMap)) {
+            log.warn("cpcIndexCalculate getExtremeValue customerId:{} have not any fact record", formDTO.getCustomerId());
+            return;
         }
+        //指标集合
+        //对指标进行分组
+        Map<String, List<IndexGroupDetailEntity>> groupIndexDetailsMap = indexDetails.stream().collect(Collectors.groupingBy(IndexGroupDetailEntity::getAllParentIndexCode));
 
-        log.info(JSON.toJSONString(minAndMaxList));
-        Map<String, BigDecimal> list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
-        return null;
+
+
+        List<Map<String, Object>> list = null;
+        int pageNo = 1;
+        int pageSize = 10;
+        do {
+            list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), (pageNo - 1) * pageSize, pageSize);
+            if (!CollectionUtils.isEmpty(list)) {
+
+                //遍历指标分组 计算分数
+                List<Map<String, Object>> finalList = list;
+                groupIndexDetailsMap.forEach((parentIndex, indexDetailList)->{
+                    Map<String, IndexInputVO<BigDecimal>> indexMap = getIndexInputVO(indexDetailList, minAndMaxMap);
+                    //遍历指标 进行计算
+                    for (Map.Entry<String, IndexInputVO<BigDecimal>> entry : indexMap.entrySet()) {
+                        String indexCode = entry.getKey();
+                        IndexInputVO<BigDecimal> value = entry.getValue();
+                        String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(indexCode);
+                        if (StringUtils.isBlank(fieldName)) {
+                            log.error("cpcIndexCalculate fieldName error");
+                            continue;
+                        }
+                        for (Map<String, Object> cpcIndex : finalList) {
+                            //对应的数值
+                            String sampleValueStr = String.valueOf(cpcIndex.get(indexCodeFieldReService.getFieldNameByIndexCode(fieldName)));
+                            //构造样本值对象
+                            SampleValue<BigDecimal> currentGridIndexValue = new SampleValue((String) cpcIndex.get(IndexCalConstant.USER_ID), new BigDecimal(sampleValueStr));
+                            value.getIndexValueVOs().add(currentGridIndexValue);
+                        }
+                    }
+                    HashMap<String, BigDecimal> result = calculate(indexMap);
+                    // TODO 处理结果
+                    saveGridCorreLationDangJian(formDTO, indexDetails, result);
+
+                    try {
+                        System.out.println( JSON.toJSONString(result));
+                    } catch (Exception e) {
+                    }
+                });
+            }
+        } while (!CollectionUtils.isEmpty(list) && pageNo++ > 0);
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void saveGridCorreLationDangJian(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexDetails, HashMap<String, BigDecimal> result) {
+
+    }
+
+    /**
+     * @param indexMap
+     * @return java.util.List<com.epmet.support.normalizing.batch.IndexOutputVO>
+     * @author yinzuomei
+     * @description
+     * @Date 2020/8/30 21:40
+     **/
+    private HashMap<String, BigDecimal> calculate(Map<String, IndexInputVO<BigDecimal>> indexMap) {
+        //构造入参
+        List<IndexInputVO> indexInputVOS = indexMap.values().stream().collect(Collectors.toList());
+        BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
+        return batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+    }
+
+    /**
+     * @param indexList    指标集合
+     * @param minAndMaxMap 最大值最小值集合
+     * @return java.util.Map<java.lang.String, com.epmet.support.normalizing.batch.IndexInputVO>
+     * @author yinzuomei
+     * @description
+     * @Date 2020/8/30 15:56
+     **/
+    private Map<String, IndexInputVO<BigDecimal>> getIndexInputVO(List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) {
+        Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>();
+        for (int indexNum = 0; indexNum < indexList.size(); indexNum++) {
+            IndexGroupDetailEntity index = indexList.get(indexNum);
+            IndexInputVO indexInputVO = new IndexInputVO();
+            // 指标code
+            indexInputVO.setIndexId(index.getIndexCode());
+            //权重
+            indexInputVO.setWeight(index.getWeight());
+            BigDecimal minValue = null;
+            BigDecimal maxValue = null;
+
+            //获取指标对应的列名
+            String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode());
+            //最小值key
+            String minValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MIN);
+            //最大值key
+            String maxValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MAX);
+            minValue = new BigDecimal(String.valueOf(minAndMaxMap.get(minValueKey)));
+            maxValue = new BigDecimal(String.valueOf(minAndMaxMap.get(maxValueKey)));
+
+            //分值计算器
+            ScoreCalculator<Integer> scoreCalculator = new BigDecimalScoreCalculator(minValue,
+                    maxValue,
+                    ScoreConstants.MIN_SCORE,
+                    ScoreConstants.MAX_SCORE,
+                    Correlation.getCorrelation(index.getCorrelation())
+            );
+            indexInputVO.setScoreCalculator(scoreCalculator);
+            List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>();
+            indexInputVO.setIndexValueVOs(sampleValueList);
+
+            map.put(index.getIndexCode(), indexInputVO);
+        }
+        return map;
     }
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexGroupDetailService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexGroupDetailService.java
index aa69cba8e7..888b36725d 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexGroupDetailService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/IndexGroupDetailService.java
@@ -35,4 +35,12 @@ public interface IndexGroupDetailService extends BaseService<IndexGroupDetailEnt
      * @param indexCode
      */
     List<IndexGroupDetailEntity> getDetailListByParentCode(String customerId,String... indexCode);
+
+    /**
+     * desc：获取所有 包含该指标code的
+     * @param customerId
+     * @param parentIndexCode
+     * @return
+     */
+    List<IndexGroupDetailEntity> getDetailListLikeParentCode(String customerId, String parentIndexCode);
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateServiceImpl.java
index 4163ea074c..611ad18f4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexCalculateServiceImpl.java
@@ -17,10 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author liujianjun
@@ -58,7 +56,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
             CalculateCommonFormDTO calculateCommonFormDTO=new CalculateCommonFormDTO(customerId, formDTO.getMonthId());
             //计算党员
             try {
-                Map<String, BigDecimal> list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(customerId, formDTO.getMonthId());
+                //Map<String, BigDecimal> list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(customerId, formDTO.getMonthId(), (pageNo - 1) * pageSize, pageSize);
             } catch (Exception e) {
 
             }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexGroupDetailServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexGroupDetailServiceImpl.java
index 0225c956c5..1135b023c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexGroupDetailServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/IndexGroupDetailServiceImpl.java
@@ -48,4 +48,9 @@ public class IndexGroupDetailServiceImpl extends BaseServiceImpl<IndexGroupDetai
         }
         return baseDao.getDetailListByParentCode(customerId,sb.deleteCharAt(sb.length()-1).toString());
     }
+
+    @Override
+    public List<IndexGroupDetailEntity> getDetailListLikeParentCode(String customerId, String parentIndexCode) {
+        return baseDao.getDetailListLikeParentCode(customerId,parentIndexCode);
+    }
 }
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
index 41946192dd..beb5b42a4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
@@ -3,33 +3,6 @@
 
 <mapper namespace="com.epmet.dao.indexcoll.FactIndexPartyAblityCpcMonthlyDao">
 
-    <resultMap type="com.epmet.entity.indexcoll.FactIndexPartyAblityCpcMonthlyEntity" id="factIndexPartyAblityCpcMonthlyMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="agencyId" column="AGENCY_ID"/>
-        <result property="parentId" column="PARENT_ID"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="monthId" column="MONTH_ID"/>
-        <result property="quarterId" column="QUARTER_ID"/>
-        <result property="yearId" column="YEAR_ID"/>
-        <result property="createTopicCount" column="CREATE_TOPIC_COUNT"/>
-        <result property="joinTopicCount" column="JOIN_TOPIC_COUNT"/>
-        <result property="shiftIssueCount" column="SHIFT_ISSUE_COUNT"/>
-        <result property="shiftProjectCount" column="SHIFT_PROJECT_COUNT"/>
-        <result property="joinThreeMeetsCount" column="JOIN_THREE_MEETS_COUNT"/>
-        <result property="groupUserCount" column="GROUP_USER_COUNT"/>
-        <result property="groupTopicCount" column="GROUP_TOPIC_COUNT"/>
-        <result property="topicToIssueRatio" column="TOPIC_TO_ISSUE_RATIO"/>
-        <result property="groupActiveUserCount" column="GROUP_ACTIVE_USER_COUNT"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="userId" column="USER_ID"/>
-    </resultMap>
-
     <delete id="deleteFactIndexPartyAblityCpcMonthly">
         delete from fact_index_party_ablity_cpc_monthly
         where CUSTOMER_ID = #{customerId} AND AGENCY_ID = #{agencyId} AND GRID_ID = #{gridId} AND USER_ID = #{userId}
@@ -94,27 +67,7 @@
         </foreach>
     </insert>
 
-    <select id="getCountByMonthId" resultType="java.util.Map">
-        SELECT
-            CUSTOMER_ID,
-            AGENCY_ID,
-            PARENT_ID,
-            GRID_ID,
-            CREATE_TOPIC_COUNT,
-            JOIN_TOPIC_COUNT,
-            SHIFT_ISSUE_COUNT,
-            SHIFT_PROJECT_COUNT,
-            JOIN_THREE_MEETS_COUNT,
-            GROUP_USER_COUNT,
-            GROUP_TOPIC_COUNT,
-            TOPIC_TO_ISSUE_RATIO,
-            GROUP_ACTIVE_USER_COUNT
-        FROM
-            fact_index_party_ablity_cpc_monthly
-        WHERE
-            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
-    </select>
+
 
     <select id="getExtremeValue" resultType="java.util.Map">
         SELECT
@@ -142,4 +95,29 @@
             CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND DEL_FLAG = '0'
     </select>
 
+    <select id="getCountByMonthId" resultType="java.util.Map">
+        SELECT
+            CUSTOMER_ID,
+            AGENCY_ID,
+            PARENT_ID,
+            GRID_ID,
+            USER_ID,
+            CREATE_TOPIC_COUNT,
+            JOIN_TOPIC_COUNT,
+            SHIFT_ISSUE_COUNT,
+            SHIFT_PROJECT_COUNT,
+            JOIN_THREE_MEETS_COUNT,
+            GROUP_USER_COUNT,
+            GROUP_TOPIC_COUNT,
+            TOPIC_TO_ISSUE_RATIO,
+            GROUP_ACTIVE_USER_COUNT
+        FROM
+            fact_index_party_ablity_cpc_monthly
+        WHERE
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+          AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+        LIMIT #{offset},#{pageSize}
+    </select>
+
+
 </mapper>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
index 6038ecbfeb..bb4e5636ae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
@@ -12,4 +12,13 @@
             CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and STATUS = 'enable' and DEL_FLAG = '0'
           and ALL_PARENT_INDEX_CODE = #{indexCode,jdbcType=VARCHAR}
     </select>
+
+    <select id="getDetailListLikeParentCode" resultType="com.epmet.entity.screen.IndexGroupDetailEntity">
+        select
+            ID, INDEX_GROUP_ID, INDEX_ID, INDEX_CODE, WEIGHT, THRESHOLD
+        FROM index_group_detail
+        WHERE
+            CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and STATUS = 'enable' and DEL_FLAG = '0'
+          and ALL_PARENT_INDEX_CODE like concat(#{indexCode,jdbcType=VARCHAR},'%')
+    </select>
 </mapper>
\ No newline at end of file