diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java index 7d17b128d1..b97139c8ff 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/index/form/IndexExplainFormDTO.java @@ -48,5 +48,11 @@ public class IndexExplainFormDTO implements Serializable { * 组织id */ private String orgId; + /** + * 月份Id + */ + private String monthId; + + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java index df3239962b..4e2c5e01e1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java @@ -22,8 +22,11 @@ public class IndexConstant { private static final String FWZS_CN = "服务指数"; private static final String ZLZS_CN = "治理指数"; private static final String ZB_CN = "指标"; - private static final String BEN_JI = "本级"; - private static final String XIA_JI = "下级"; + private static final String BEN_JI_CN = "本级"; + private static final String XIA_JI_CN = "下级"; + + public static final String ZI_SHEN = "ZISHEN"; + public static final String XIA_JI = "xiaji"; /** @@ -41,11 +44,11 @@ public class IndexConstant { } if (allIndexCode.contains(FactConstant.DJNL)) { - result.add(BEN_JI + DJZS_CN + ZB_CN); + result.add(BEN_JI_CN + DJZS_CN + ZB_CN); } else if (allIndexCode.contains(FactConstant.FWNL)) { - result.add(BEN_JI + FWZS_CN + ZB_CN); + result.add(BEN_JI_CN + FWZS_CN + ZB_CN); } else if (allIndexCode.contains(FactConstant.ZLNL)) { - result.add(BEN_JI + ZLZS_CN + ZB_CN); + result.add(BEN_JI_CN + ZLZS_CN + ZB_CN); } result.addAll(ScoreLastHeader); return result; @@ -62,11 +65,11 @@ public class IndexConstant { public static List getStandardSubHeaders(String allIndexCode) { List result = new ArrayList<>(8); if (allIndexCode.contains(FactConstant.DJNL)) { - result.add(XIA_JI + DJZS_CN + ZB_CN); + result.add(XIA_JI_CN + DJZS_CN + ZB_CN); } else if (allIndexCode.contains(FactConstant.FWNL)) { - result.add(XIA_JI + FWZS_CN + ZB_CN); + result.add(XIA_JI_CN + FWZS_CN + ZB_CN); } else if (allIndexCode.contains(FactConstant.ZLNL)) { - result.add(XIA_JI + ZLZS_CN + ZB_CN); + result.add(XIA_JI_CN + ZLZS_CN + ZB_CN); } result.addAll(QuantityLastHeader); return result; 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 ac2e998e2e..0734fadda1 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 @@ -103,11 +103,11 @@ public class IndexExplainServiceImpl implements IndexExplainService { String type = explainDTO.getType(); String allIndexCodePath = null; List tableList = null; - if ("zishen".equals(type)) { + if (IndexConstant.ZI_SHEN.equals(type)) { allIndexCodePath = "wanggexiangguan:dangjiannengli"; tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath); result.setTableDataList(tableList); - } else if ("xiaji".equals(type)) { + } else if (IndexConstant.XIA_JI.equals(type)) { allIndexCodePath = "dangyuanxiangguan:lianxiqunzhong"; tableList = setDefaultTableData(detailEntityMap, type, allIndexCodePath); result.setTableDataList(tableList);