diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java index 96005bfcc3..5ea0aa7cbf 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/constant/ScreenConstant.java @@ -16,6 +16,8 @@ public interface ScreenConstant { String COMMA = ","; + String COLON = ":"; + String MONTH_ID = "month"; String YEAR_ID = "year"; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 9da23db2e6..e53a9eb10e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -129,10 +129,10 @@ public class AgencyServiceImpl implements AgencyService { sub.setChildren(treeResultDTOS); }else { List subAgency = new ArrayList<>(); - if (sub.getPids().contains(",")){ - subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue()); + if (sub.getPids().contains(ScreenConstant.COMMA)){ + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue()); }else { - subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue()); + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue()); } sub.setChildren(subAgency); } @@ -156,10 +156,10 @@ public class AgencyServiceImpl implements AgencyService { sub.setChildren(treeResultDTOS); }else { List subAgency = new ArrayList<>(); - if (sub.getPids().contains(",")){ - subAgency = getDepartmentList(sub.getPids() + "," + sub.getValue()); + if (sub.getPids().contains(ScreenConstant.COMMA)){ + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COMMA + sub.getValue()); }else { - subAgency = getDepartmentList(sub.getPids() + ":" + sub.getValue()); + subAgency = getDepartmentList(sub.getPids() + ScreenConstant.COLON + sub.getValue()); } sub.setChildren(subAgency); }