Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexScoreFormDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.evaluationindex.index.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  指标分数 返回结果
+ * @Author sun
+ */
+@Data
+public class IndexScoreFormDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 6225580299239889980L;
+
+    private String customerId;
+    /**
+     * 组织或网格Id
+     */
+    private String orgId;
+    /**
+     * 组织或网格类型
+     */
+    private String orgType;
+
+    /**
+     * 月份Id（格式：202009）
+     */
+    private String monthId;
+    /**
+     * 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
+     */
+    private String indexCode;
+    /**
+     * 所有有权重的指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java

@@ -39,6 +39,11 @@ public class IndexScoreDetailResult implements Serializable {
      */
     private String weight;
 
+    /**
+     * 数量
+     */
+    private String quantity;
+
 
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java

@@ -0,0 +1,40 @@
+package com.epmet.evaluationindex.index.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *  指标分数 返回结果
+ * @Author sun
+ */
+@Data
+public class IndexScoreResult implements Serializable {
+
+
+    private static final long serialVersionUID = -8458272574625683349L;
+    /**
+     * 指标code
+     */
+    private String indexCode;
+    /**
+     * 指标对应值（数值或百分比）原始值
+     */
+    private BigDecimal score;
+
+    /**
+     * 指标对应的权重
+     */
+    private BigDecimal weight;
+
+    /**
+     * 原始值
+     */
+    private String originValue;
+    /**
+     * 数量
+     */
+    private String quantity;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcScoreDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.FactIndexCpcScoreEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Mapper
+public interface FactIndexCpcScoreDao extends BaseDao<FactIndexCpcScoreEntity> {
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCpcSubScoreDao.java

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.datareport.entity.evaluationindex.FactIndexCpcSubScoreEntity;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Mapper
+public interface FactIndexCpcSubScoreDao extends BaseDao<FactIndexCpcSubScoreEntity> {
+
+    List<IndexScoreResult> selecCpcAvgScore(IndexScoreFormDTO ablityListFormDTO);
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java

@@ -17,6 +17,8 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
 import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
@@ -48,4 +50,14 @@ public interface FactIndexGridSubScoreDao {
      * @author sun
      */
     LinkedList<MonthAblityListResultDTO> selectGridMonthAblityList(MonthAblityListFormDTO formDTO);
+
+    /**
+     * desc: 查询分数
+     *
+     * @param ablityListFormDTO
+     * @return java.util.List<com.epmet.evaluationindex.index.result.IndexScoreResult>
+     * @author LiuJanJun
+     * @date 2021/5/14 2:07 下午
+     */
+    List<IndexScoreResult> selectGridSubScore(IndexScoreFormDTO ablityListFormDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcScoreEntity.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_index_cpc_score")
+public class FactIndexCpcScoreEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格所属的机关Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 年度ID: yyyy
+     */
+	private String yearId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 1：总分；0不是 默认0
+     */
+	private String isTotal;
+
+    /**
+     * 分值
+     */
+	private BigDecimal score;
+
+    /**
+     * 参与议事分值：canyuyishi；
+党务活动分值：dangwuhuodong；
+联系群众分值：lianxiqunzhong；
+党建能力分值：dangjiannengli
+     */
+	private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/entity/evaluationindex/FactIndexCpcSubScoreEntity.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.entity.evaluationindex;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 党员相关分值
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-05-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_index_cpc_sub_score")
+public class FactIndexCpcSubScoreEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 网格所属的机关Id
+     */
+	private String agencyId;
+
+    /**
+     * 网格Id
+     */
+	private String gridId;
+
+    /**
+     * 年度ID: yyyy
+     */
+	private String yearId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+	private String monthId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * 计算指标时的原始值 字符串类型
+     */
+	private String originValue;
+
+    /**
+     * 分值
+     */
+	private BigDecimal score;
+
+    /**
+     * 参与议事分值：canyuyishi；
+党务活动分值：dangwuhuodong；
+联系群众分值：lianxiqunzhong；
+党建能力分值：dangjiannengli
+     */
+	private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+	private String allParentIndexCode;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+	private BigDecimal weight;
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.epmet.datareport.service.evaluationindex.index.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
@@ -25,15 +24,16 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.IndexConstant;
 import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao;
 import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao;
+import com.epmet.datareport.dao.fact.FactIndexCpcSubScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao;
 import com.epmet.datareport.service.evaluationindex.index.IndexExplainService;
 import com.epmet.evaluationindex.index.dto.IndexExplainTreeDTO;
 import com.epmet.evaluationindex.index.form.IndexExplainFormDTO;
+import com.epmet.evaluationindex.index.form.IndexScoreFormDTO;
 import com.epmet.evaluationindex.index.result.IndexExplainResult;
 import com.epmet.evaluationindex.index.result.IndexGroupDetailResult;
 import com.epmet.evaluationindex.index.result.IndexScoreDetailResult;
-import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
+import com.epmet.evaluationindex.index.result.IndexScoreResult;
-import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,6 +60,8 @@ public class IndexExplainServiceImpl implements IndexExplainService {
     private IndexGroupDetailDao indexGroupDetailDao;
     @Autowired
     private FactIndexGridSubScoreDao gridSubScoreDao;
+    @Autowired
+    private FactIndexCpcSubScoreDao factIndexCpcSubScoreDao;
 
 
     @Override
@@ -82,15 +84,12 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             results.add(result);
             result.setTitle(explainDTO.getTitle());
             result.setMeaning(explainDTO.getMeaning());
-
+            //设置表格数据
             setTableData(formDTO, detailEntityMap, explainDTO, result);
-
+            //子节点
-
             setChildren(formDTO, detailEntityMap, result, explainDTO, explainDTO.getChildren());
-            System.out.println(JSON.toJSONString(result));
         }
 
-
         return results;
     }
 
@@ -102,44 +101,40 @@ public class IndexExplainServiceImpl implements IndexExplainService {
             switch (explainDTO.getOrgLevel()) {
                 case "grid":
                     String type = explainDTO.getType();
-                    String allIndexCodePath = explainDTO.getIndexCode();
+                    String allIndexCodePath = null;
-                    List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+                    List<IndexScoreDetailResult> tableList = null;
-                    List<IndexScoreDetailResult> tableList = new ArrayList<>();
+                    if ("zishen".equals(type)) {
-                    indexGroupDetailEntities.forEach(index -> {
+                        allIndexCodePath = "wanggexiangguan:dangjiannengli";
-                        //设置默认值
+                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
-                        if (!index.getAllIndexCodePath().contains(type)) {
+                        result.setTableDataList(tableList);
-                            return;
+                    } else if ("xiaji".equals(type)) {
-                        }
+                        allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong";
-                        IndexScoreDetailResult table = new IndexScoreDetailResult();
+                        tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath);
-                        table.setIndexCode(index.getIndexCode());
+                        result.setTableDataList(tableList);
-                        table.setIndexName(index.getIndexName());
+                    }
-                        table.setOriginValue(NumConstant.ZERO_STR);
-                        table.setScore(NumConstant.ZERO_STR);
-                        table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                        tableList.add(table);
-
-
-                    });
-                    result.setTableDataList(tableList);
                     //set Target value
+                    IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO();
+                    ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
+                    ablityListFormDTO.setOrgId(formDTO.getOrgId());
+                    ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
+                    ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    //下钻到党员
+                    List<IndexScoreResult> scoreList = null;
                     if (goDown == 1) {
-                        AblityListFormDTO ablityListFormDTO = new AblityListFormDTO();
+                        scoreList = factIndexCpcSubScoreDao.selecCpcAvgScore(ablityListFormDTO);
-                        ablityListFormDTO.setCustomerId(formDTO.getCustomerId());
+                    } else {
-                        ablityListFormDTO.setOrgId(formDTO.getOrgId());
+                        //不下钻
-                        ablityListFormDTO.setOrgType(formDTO.getOrgLevel());
+                        scoreList = gridSubScoreDao.selectGridSubScore(ablityListFormDTO);
-                        ablityListFormDTO.setMonthId(DateUtils.getCurrentTimeBeforeMonthId());
+                    }
-                        ablityListFormDTO.setAllParentIndexCode(allIndexCodePath);
+                    for (IndexScoreResult score : scoreList) {
-
+                        for (IndexScoreDetailResult tb : tableList) {
-                        List<AblityListResultDTO> scoreList = gridSubScoreDao.selectGridAblityList(ablityListFormDTO);
+                            if (tb.getIndexCode().equals(score.getIndexCode())) {
-                        scoreList.forEach(score -> {
+                                tb.setOriginValue(score.getOriginValue());
-                            for (IndexScoreDetailResult tb : tableList) {
+                                tb.setScore(String.valueOf(score.getScore()));
-                                if (tb.getIndexCode().equals(score.getKey())) {
+                                tb.setQuantity(score.getQuantity());
-                                    tb.setOriginValue(score.getValue());
+                                tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                                    tb.setScore(String.valueOf(score.getScore()));
-                                    tb.setWeight(score.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
-                                }
                             }
-                        });
+                        }
                     }
                     break;
                 default:
@@ -148,6 +143,21 @@ public class IndexExplainServiceImpl implements IndexExplainService {
         }
     }
 
+    private List<IndexScoreDetailResult> setDefaultTableData(Map<String, List<IndexGroupDetailResult>> detailEntityMap, String type, String allIndexCodePath) {
+        List<IndexGroupDetailResult> indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath);
+        List<IndexScoreDetailResult> tableList = new ArrayList<>();
+        indexGroupDetailEntities.forEach(index -> {
+            IndexScoreDetailResult table = new IndexScoreDetailResult();
+            table.setIndexCode(index.getIndexCode());
+            table.setIndexName(index.getIndexName());
+            table.setOriginValue(NumConstant.ZERO_STR);
+            table.setScore(NumConstant.ZERO_STR);
+            table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP) + "%");
+            tableList.add(table);
+        });
+        return tableList;
+    }
+
     private void setChildren(IndexExplainFormDTO formDTO, Map<String, List<IndexGroupDetailResult>> detailEntityMap, IndexExplainResult result, IndexExplainTreeDTO parentNode, List<IndexExplainTreeDTO> children) {
         List<IndexExplainResult> childrenList = new ArrayList<>();
         children.forEach(child -> {

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcScoreDao.xml

@@ -0,0 +1,28 @@
+<?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.datareport.dao.fact.FactIndexCpcScoreDao">
+
+    <!--<resultMap type="com.epmet.entity.FactIndexCpcScoreEntity" id="factIndexCpcScoreMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="isTotal" column="IS_TOTAL"/>
+        <result property="score" column="SCORE"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
+        <result property="weight" column="WEIGHT"/>
+        <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"/>
+    </resultMap>-->
+
+
+</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml

@@ -0,0 +1,43 @@
+<?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.datareport.dao.fact.FactIndexCpcSubScoreDao">
+
+    <!--<resultMap type="com.epmet.entity.FactIndexCpcSubScoreEntity" id="factIndexCpcSubScoreMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="agencyId" column="AGENCY_ID"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="yearId" column="YEAR_ID"/>
+        <result property="monthId" column="MONTH_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="originValue" column="ORIGIN_VALUE"/>
+        <result property="score" column="SCORE"/>
+        <result property="indexCode" column="INDEX_CODE"/>
+        <result property="allParentIndexCode" column="ALL_PARENT_INDEX_CODE"/>
+        <result property="weight" column="WEIGHT"/>
+        <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"/>
+    </resultMap>-->
+
+
+
+    <select id="selecCpcAvgScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+            SELECT
+                id, customer_id, agency_id, grid_id, year_id, month_id, user_id,
+                COUNT(*) quantity,
+                ROUND(AVG(score),2) score,
+                index_code, all_parent_index_code, weight
+            FROM  fact_index_cpc_sub_score
+            WHERE ALL_PARENT_INDEX_CODE = #{allParentIndexCode}
+            AND CUSTOMER_ID = #{customerId}
+            and GRID_ID = #{orgId}
+            and MONTH_ID = #{monthId}
+            GROUP BY INDEX_CODE;
+    </select>
+
+ </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@@ -40,5 +40,37 @@
         ORDER BY
             fact.month_id ASC
     </select>
+    <select id="selectGridSubScore" resultType="com.epmet.evaluationindex.index.result.IndexScoreResult">
+     <!--   SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.SCORE,2） AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_grid_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+        AND fact.all_parent_index_code = #{allParentIndexCode}
+        AND customer_id = #{customerId}
+        AND grid_id = #{orgId}
+        AND month_id = #{monthId}-->
+
+         SELECT
+            fact.index_code,
+            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            round(fact.score,2) AS score,
+            round(fact.WEIGHT,2) AS weight
+        FROM
+            fact_index_grid_sub_score fact
+        WHERE
+            fact.del_flag = '0'
+            AND fact.all_parent_index_code = #{allParentIndexCode}
+            AND customer_id = #{customerId}
+            AND grid_id = #{orgId}
+            AND month_id = #{monthId}
+
+
+
+    </select>
 
 </mapper>