|
@@ -104,7 +104,7 @@ public class EconomicService {
|
|
|
gsls = station1ls.stream().filter(wp -> wp != null && "JS_RGN-2".contains(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
|
|
|
trls = treels.stream().filter(wp -> wp.getId().endsWith("STA")).collect(Collectors.toList());
|
|
|
} else {
|
|
|
- gsls = station1ls.stream().filter(wp -> "STA".contains(wp.getForeignKeyId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
|
|
|
+ gsls = station1ls.stream().filter(wp -> wp.getForeignKeyId().contains("STA") && date.equals(wp.getRecordDate())).collect(Collectors.toList());
|
|
|
trls = treels.stream().filter(wp -> wp.getParentCode().endsWith(companyId)).collect(Collectors.toList());
|
|
|
}
|
|
|
|