|
@@ -999,13 +999,21 @@ public class IotRhDailyReportController {
|
|
|
|
|
|
|
|
// 小组内最后1条记录标识
|
|
// 小组内最后1条记录标识
|
|
|
findAndThen(groupIdGasInjectionPair, reportVO.getId(), gasInjection -> reportVO.setLastGroupIdFlag(true));
|
|
findAndThen(groupIdGasInjectionPair, reportVO.getId(), gasInjection -> reportVO.setLastGroupIdFlag(true));
|
|
|
- // 小组内累计注气量
|
|
|
|
|
- findAndThen(groupIdGasInjectionPair, reportVO.getId(), gasInjection -> reportVO.setGroupIdGasInjection(gasInjection));
|
|
|
|
|
|
|
+ // 小组内累计注气量 精确到单位 万方
|
|
|
|
|
+ findAndThen(groupIdGasInjectionPair, reportVO.getId(), gasInjection -> {
|
|
|
|
|
+ BigDecimal gasInjectionWanFang = gasInjection
|
|
|
|
|
+ .divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP);
|
|
|
|
|
+ reportVO.setGroupIdGasInjection(gasInjectionWanFang);
|
|
|
|
|
+ });
|
|
|
// 小组内累计注水量
|
|
// 小组内累计注水量
|
|
|
findAndThen(groupIdWaterInjectionPair, reportVO.getId(), waterInjection -> reportVO.setGroupIdWaterInjection(waterInjection));
|
|
findAndThen(groupIdWaterInjectionPair, reportVO.getId(), waterInjection -> reportVO.setGroupIdWaterInjection(waterInjection));
|
|
|
- // 小组内累计用电量
|
|
|
|
|
- findAndThen(groupIdPowerPair, reportVO.getId(), power -> reportVO.setGroupIdPower(power));
|
|
|
|
|
- // 小组内累计油耗
|
|
|
|
|
|
|
+ // 小组内累计用电量 MWh
|
|
|
|
|
+ findAndThen(groupIdPowerPair, reportVO.getId(), power -> {
|
|
|
|
|
+ BigDecimal powerWanFang = power
|
|
|
|
|
+ .divide(BigDecimal.valueOf(1000), 4, RoundingMode.HALF_UP);
|
|
|
|
|
+ reportVO.setGroupIdPower(powerWanFang);
|
|
|
|
|
+ });
|
|
|
|
|
+ // 小组内累计油耗 L
|
|
|
findAndThen(groupIdFuelPair, reportVO.getId(), fuel -> reportVO.setGroupIdFuel(fuel));
|
|
findAndThen(groupIdFuelPair, reportVO.getId(), fuel -> reportVO.setGroupIdFuel(fuel));
|
|
|
// 小组内累计注气时间
|
|
// 小组内累计注气时间
|
|
|
findAndThen(groupIdGasTimePair, reportVO.getId(), gasTime -> reportVO.setGroupIdGasTime(gasTime));
|
|
findAndThen(groupIdGasTimePair, reportVO.getId(), gasTime -> reportVO.setGroupIdGasTime(gasTime));
|