java110
2021-03-04 f68b924aa8c7c6f318f4f79e559bb5d55c4e4d09
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);