From f68b924aa8c7c6f318f4f79e559bb5d55c4e4d09 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 13:28:59 +0800
Subject: [PATCH] 优化水电抄表bug
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
index 1f53d02..fae3be3 100644
--- a/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
@@ -78,10 +78,12 @@
meterWaterDto.setObjId(tmpRoomDto.getRoomId());
List<MeterWaterDto> meterWaterDtos = meterWaterInnerServiceSMOImpl.queryMeterWaters(meterWaterDto);
importExportMeterWaterDto = BeanConvertUtil.covertBean(tmpRoomDto, ImportExportMeterWaterDto.class);
- String preDegree = meterWaterDtos == null ? "0" : meterWaterDtos.get(0).getCurDegrees();
- String preReadTime = meterWaterDtos == null ? DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A)
- : meterWaterDtos.get(0).getCurReadingTime();
-
+ String preDegree = "0" ;
+ String preReadTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B);
+ if(meterWaterDtos != null && meterWaterDtos.size()> 0){
+ preDegree = meterWaterDtos.get(0).getCurDegrees();
+ preReadTime = DateUtil.dateTimeToDate(meterWaterDtos.get(0).getCurReadingTime());
+ }
importExportMeterWaterDto.setPreDegrees(preDegree);
importExportMeterWaterDto.setPreReadingTime(preReadTime);
importExportMeterWaterDtos.add(importExportMeterWaterDto);
--
Gitblit v1.8.0