Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/AbstractReductionAdviceService.java10
-rwxr-xr-xopenk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceAdjustmentService.java1
2 files changed, 6 insertions, 5 deletions
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/AbstractReductionAdviceService.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/AbstractReductionAdviceService.java
index 9c5e5811..2fe50016 100755
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/AbstractReductionAdviceService.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/AbstractReductionAdviceService.java
@@ -111,16 +111,16 @@ public abstract class AbstractReductionAdviceService extends AbstractService {
getSynchronousMachineListWithSubGeographicalRegionList(activityJpa);
+ // list of Substation/Transformer Stations
+ } else if (activityJpa.getSubstationJpaList() != null && activityJpa.getSubstationJpaList().size() >= 0) {
+
+ getSynchronousMachineListWithSubstationList(activityJpa);
+
// list of SubGeographicalRegion
} else if (activityJpa.getSubGeographicalRegionJpaList() != null
&& activityJpa.getSubGeographicalRegionJpaList().size() > 0) {
getSynchronousMachineListWithSubGeographicalRegionList(activityJpa);
-
- // list of Substation/Transformer Stations
- } else if (activityJpa.getSubstationJpaList() != null && activityJpa.getSubstationJpaList().size() >= 0) {
-
- getSynchronousMachineListWithSubstationList(activityJpa);
}
}
diff --git a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceAdjustmentService.java b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceAdjustmentService.java
index ad866ebb..ff5c11ce 100755
--- a/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceAdjustmentService.java
+++ b/openk-platform/openk-eisman-portlet/src/main/java/org/eclipse/openk/eisman/service/ReductionAdviceAdjustmentService.java
@@ -42,6 +42,7 @@ public class ReductionAdviceAdjustmentService extends AbstractReductionAdviceSer
activityJpaFindService.findActivity(activityJpa.getParentActivityJpaId())));
activityJpa.setSubGeographicalRegionJpaList(latestConfirmedChildActivity.getSubGeographicalRegionJpaList());
+ activityJpa.setSubstationJpaList(latestConfirmedChildActivity.getSubstationJpaList());
final List<SynchronousMachineJpa> synchronousMachineJpaListAlredyReduced =
activityJpaService.getSynchronousMachineListOfActivity(latestConfirmedChildActivity);

Back to the top