|
@@ -320,13 +320,13 @@ public class TwinCalcDay extends BaseEntity {
|
|
|
*/
|
|
|
public void calcDays(List<TwinCalcDay> days) {
|
|
|
days.forEach(day -> {
|
|
|
- this.weight = weight.add(day.getWeight());
|
|
|
- this.weightA = weightA.add(day.getWeightA());
|
|
|
- this.weightB = weightB.add(day.getWeightB());
|
|
|
+ this.weight = weight.add(day.getLength());
|
|
|
+ this.weightA = weightA.add(day.getLengthA());
|
|
|
+ this.weightB = weightB.add(day.getLengthB());
|
|
|
|
|
|
this.kwh = kwh.add(day.getKwh());
|
|
|
- this.kwhA = kwhA.add(day.getKwh());
|
|
|
- this.kwhB = kwhB.add(day.getKwh());
|
|
|
+ this.kwhA = kwhA.add(day.getKwhA());
|
|
|
+ this.kwhB = kwhB.add(day.getKwhB());
|
|
|
|
|
|
this.stop1A += day.getStop1A();
|
|
|
this.stop1B += day.getStop1B();
|