From 513dd6fdef2b53faa02e3cad74aa9b307a6f2e3a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 May 2021 21:47:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactGridGovernDailyEntity.java | 41 +++++++++++- .../GovernGridClosedTotalCommonDTO.java | 64 +++++++++++++++++++ .../extract/ProjectInfoDTO.java | 15 +++++ .../impl/FactGridGovernDailyServiceImpl.java | 55 ++++++++++++++-- 4 files changed, 169 insertions(+), 6 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java index ae45d7aa7d..22fa2b2b67 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactGridGovernDailyEntity.java @@ -79,7 +79,22 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity { */ private BigDecimal gridSelfGovernRatio; - /** + /** + * 界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数 + */ + private BigDecimal communityClosedRatio; + + /** + * 界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数 + */ + private BigDecimal streetClosedRatio; + + /** + * 界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数 + */ + private BigDecimal districtDeptClosedRatio; + + /** * 1、当前网格内，话题关闭已解决数 */ private Integer topicResolvedCount; @@ -155,15 +170,36 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity { private Integer gridSelfGovernProjectTotal; + /** + * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数 + */ + private Integer communityClosedCount; + + /** + * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数 + */ + private Integer streetClosedCount; + + /** + * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数 + */ + private Integer districtDeptClosedCount; + + public FactGridGovernDailyEntity() { this.customerId = StrConstant.EPMETY_STR; this.dateId = StrConstant.EPMETY_STR; this.gridId = StrConstant.EPMETY_STR; this.pid = StrConstant.EPMETY_STR; this.pids = StrConstant.EPMETY_STR; + //界面展示 this.problemResolvedCount = NumConstant.ZERO; this.groupSelfGovernRatio=BigDecimal.ZERO; this.gridSelfGovernProjectTotal=NumConstant.ZERO; + this.communityClosedRatio=BigDecimal.ZERO; + this.streetClosedRatio=BigDecimal.ZERO; + this.districtDeptClosedRatio=BigDecimal.ZERO; + this.topicResolvedCount=NumConstant.ZERO; this.topicUnResolvedCount=NumConstant.ZERO; this.issueResolvedCount=NumConstant.ZERO; @@ -179,5 +215,8 @@ public class FactGridGovernDailyEntity extends BaseEpmetEntity { this.fromAgencyResolvedInGridCount=NumConstant.ZERO; this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO; this.gridSelfGovernProjectTotal=NumConstant.ZERO; + this.communityClosedCount=NumConstant.ZERO; + this.streetClosedCount=NumConstant.ZERO; + this.districtDeptClosedCount=NumConstant.ZERO; } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java new file mode 100644 index 0000000000..fcc4193885 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernGridClosedTotalCommonDTO.java @@ -0,0 +1,64 @@ +package com.epmet.entity.evaluationindex.extract; + +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2021/5/26 15:47 + */ +@Data +public class GovernGridClosedTotalCommonDTO implements Serializable { + private static final long serialVersionUID = 7717094992132062415L; + private String gridId; + /** + * 11、来源于议题的项目，未出网格结案并且已解决的项目数 + */ + private Integer fromIssueResolvedInGridCount; + + /** + * 12、来源于议题的项目，未出网格结案并且无需解决的项目数 + */ + private Integer fromIssueUnResolvedInGridCount; + + /** + * 13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0 + */ + private Integer fromAgencyResolvedInGridCount; + + /** + * 14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0 + */ + private Integer fromAgencyUnResolvedInGridCount; + + /** + * 当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数 + */ + private Integer communityClosedCount; + + /** + * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数 + */ + private Integer streetClosedCount; + + /** + * 当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数 + */ + private Integer districtDeptClosedCount; + + public GovernGridClosedTotalCommonDTO(){ + this.gridId = StrConstant.EPMETY_STR; + this.fromIssueResolvedInGridCount=NumConstant.ZERO; + this.fromIssueUnResolvedInGridCount=NumConstant.ZERO; + this.fromAgencyResolvedInGridCount=NumConstant.ZERO; + this.fromAgencyUnResolvedInGridCount=NumConstant.ZERO; + this.communityClosedCount=NumConstant.ZERO; + this.streetClosedCount=NumConstant.ZERO; + this.districtDeptClosedCount=NumConstant.ZERO; + } +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java new file mode 100644 index 0000000000..0b1eb1af59 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java @@ -0,0 +1,15 @@ +package com.epmet.entity.evaluationindex.extract; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2021/5/26 18:00 + */ +@Data +public class ProjectInfoDTO implements Serializable { +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java index 4f5483e7b4..84c4addeea 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.constant.ProjectConstant; import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao; import com.epmet.dto.org.GridInfoDTO; import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity; +import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO; import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO; import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService; import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService; @@ -42,6 +43,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 网格的治理指数，按天统计 @@ -86,6 +88,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl gridIds=gridInfoDTOList.stream().map(GridInfoDTO::getGridId).collect(Collectors.toList()); List insertEntityList=this.constructFactGridGovernDailyEntityList(customerId,dateId,gridInfoDTOList); // log.info(JSON.toJSONString(insertEntityList,true)); @@ -102,7 +105,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED); Map inGroupTopicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ONE_STR); Map inGroupTopicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ONE_STR); - + Map dtoMap=getGovernGridClosedTotalCommonDTOMap(customerId,gridIds); for(FactGridGovernDailyEntity insertEntity:insertEntityList){ //1、当前网格内，话题关闭已解决数 @@ -154,18 +157,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl getGovernGridClosedTotalCommonDTOMap(String customerId, List gridIds) { + Map resultMap=new HashMap<>(); + for(String gridId:gridIds){ + + } + return resultMap; + } + /** * 构造要插入的数据，每个网格一天一条数据，初始赋值0 * From c14e069f774fabeca0f7b15c8b194d1687b2d4d5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 27 May 2021 10:09:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=93=8D=E4=BD=9C=E5=BF=85=E9=A1=BB=E6=98=AF=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E6=89=8D=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 4221d063f9..af8191b9a2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -428,6 +428,9 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 27 May 2021 10:59:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E6=9D=83=E9=87=8D=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/result/IndexScoreDetailResult.java | 6 ++- .../index/result/IndexScoreResult.java | 8 +++- .../index/impl/IndexExplainServiceImpl.java | 45 ++++++++++++++----- .../fact/impl/FactIndexServiceImpl.java | 5 +++ .../fact/FactIndexAgencySubScoreDao.xml | 5 ++- .../mapper/fact/FactIndexCpcSubScoreDao.xml | 2 +- .../mapper/fact/FactIndexDeptSubScoreDao.xml | 2 +- 7 files changed, 56 insertions(+), 17 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java index 8b30af940f..cdec4cc3e9 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreDetailResult.java @@ -1,5 +1,6 @@ package com.epmet.evaluationindex.index.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -40,9 +41,10 @@ public class IndexScoreDetailResult implements Serializable { private String weight; /** - * 数量 + * 类型 取原始值 还是数量 */ - private String quantity; + @JsonIgnore + private String type; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java index c817b5de55..d6ca46a913 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/result/IndexScoreResult.java @@ -32,9 +32,15 @@ public class IndexScoreResult implements Serializable { * 原始值 */ private String originValue; + /** * 数量 */ - private String quantity; + private String sampleCount; + + /** + * 值类型 + */ + private String valueType; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java index 5c8ceaf757..77252eb6ad 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.enums.OrgLevelEnum; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.DataSourceConstant; +import com.epmet.datareport.constant.FactConstant; import com.epmet.datareport.constant.IndexConstant; import com.epmet.datareport.dao.evaluationindex.index.IndexExplainDao; import com.epmet.datareport.dao.evaluationindex.index.IndexGroupDetailDao; @@ -184,10 +185,10 @@ public class IndexExplainServiceImpl implements IndexExplainService { break; default: - log.error("暂不支持更高级别的查询，level:{}",orgLevel); + log.error("暂不支持更高级别的查询，level:{}", orgLevel); } - setRealValue(result.getTableDataList(), realScoreList); + setRealValue(result.getTableDataList(), realScoreList, tableHeaders); } } @@ -196,11 +197,12 @@ public class IndexExplainServiceImpl implements IndexExplainService { * * @param tableList * @param scoreList + * @param tableHeaders * @return void * @author LiuJanJun * @date 2021/5/19 2:07 下午 */ - private void setRealValue(List tableList, List scoreList) { + private void setRealValue(List tableList, List scoreList, List tableHeaders) { if (CollectionUtils.isEmpty(tableList) || CollectionUtils.isEmpty(scoreList)) { return; } @@ -209,19 +211,37 @@ public class IndexExplainServiceImpl implements IndexExplainService { if (!tb.getIndexCode().equals(score.getIndexCode())) { continue; } - tb.setOriginValue(score.getOriginValue()); tb.setScore(String.valueOf(score.getScore())); - if (StringUtils.isNotBlank(score.getQuantity())) { - tb.setQuantity(score.getQuantity()); + tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(0, BigDecimal.ROUND_HALF_UP) + "%"); + if (tableHeaders.contains("平均值")) { + if (StringUtils.isNotBlank(score.getSampleCount())) { + tb.setOriginValue(score.getSampleCount()); + } + } else { + tb.setOriginValue(score.getOriginValue()); + } + + + //小数类型，四舍五入保留小数点后一位 + if (FactConstant.INTEGER.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP); + tb.setOriginValue(num.toString()); + } + if (FactConstant.DECIMAL.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); + tb.setOriginValue(num.toString()); + } + //百分数类型，四舍五入保留小数点后一位并转成百分比 + if (FactConstant.PERCENT.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); + tb.setOriginValue(num + "%"); } - tb.setWeight(score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)) + "%"); } } } private List setDefaultTableData(String orgLevel, String type, Map> detailEntityMap, IndexExplainResult result, String allIndexCodePath, List indexGroupDetailEntities) { - if (indexGroupDetailEntities == null) { indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath); } @@ -236,15 +256,18 @@ public class IndexExplainServiceImpl implements IndexExplainService { if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) { return; } - if ((!"grid".equals(orgLevel) && !"district".equals(orgLevel)) && !index.getAllIndexCodePath().contains(type)) { + if ("district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) { + return; + } + if (!"grid".equals(orgLevel) && !"district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) { return; } 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) + "%"); - table.setQuantity(NumConstant.ZERO_STR); + table.setWeight(index.getWeight().multiply(new BigDecimal(100)).setScale(0, BigDecimal.ROUND_HALF_UP) + "%"); + table.setType(type); tableList.add(table); if (new BigDecimal(-1).compareTo(index.getThreshold()) != 0) { threlodList.add(index.getIndexName().concat(String.format(IndexConstant.THRESHOLD_TEXT, index.getThreshold().intValue()))); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java index 596b1e9dd6..7a5eeee0d1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java @@ -335,6 +335,11 @@ public class FactIndexServiceImpl implements FactIndexService { resultList.forEach(result -> { list.stream().filter(dto -> dto.getIndexCode().equals(result.getKey())).forEach(l -> { result.setShowType(l.getValueType()); + //整数 + if (FactConstant.DECIMAL.equals(l.getValueType())) { + BigDecimal num = new BigDecimal(result.getValue()).setScale(0, BigDecimal.ROUND_HALF_UP); + result.setValue(num.toString()); + } //小数类型，四舍五入保留小数点后一位 if (FactConstant.DECIMAL.equals(l.getValueType())) { BigDecimal num = new BigDecimal(result.getValue()).setScale(1, BigDecimal.ROUND_HALF_UP); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml index d1b1dafeea..aafd8dd25b 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencySubScoreDao.xml @@ -46,9 +46,12 @@ fact.index_code, IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value, round(fact.score,1) AS score, - round(fact.WEIGHT,2) AS weight + round(fact.WEIGHT,2) AS weight, + SAMPLE_COUNT, + dict.VALUE_TYPE FROM fact_index_agency_sub_score fact + LEFT JOIN index_dict dict ON fact.index_code = dict.index_code WHERE fact.del_flag = '0' AND fact.all_parent_index_code = #{allParentIndexCode} diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml index 84ea0eca60..4e7171912d 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCpcSubScoreDao.xml @@ -29,7 +29,7 @@