|
@@ -775,7 +775,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -922,7 +922,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -1068,7 +1068,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay5> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay5 tqinfoday = optional.get();
|
|
@@ -1215,7 +1215,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -1361,7 +1361,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -1507,7 +1507,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -1653,7 +1653,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|
|
@@ -1799,7 +1799,7 @@ public class SpecificService {
|
|
|
});
|
|
|
resultList.stream().forEach(i->{
|
|
|
Optional<ProEconPowerstationInfoDay1> optional = sameperiodList.stream()
|
|
|
- .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && String.valueOf(DateUtils.getMonth(j.getRecordDate())).equals(i.getMonth()))
|
|
|
+ .filter(j -> j.getForeignKeyId().equals(i.getWpid()) && DateUtils.getMonth(j.getRecordDate())==(i.getMonth()))
|
|
|
.findFirst();
|
|
|
if (optional.isPresent()){
|
|
|
ProEconPowerstationInfoDay1 tqinfoday = optional.get();
|