From 38b7741d060048ebfd7be48cbc5980eeaeba287b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 19:10:12 +0800
Subject: [PATCH] 加入抄表动态单价功能
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 97ab58e..678575f 100755
--- 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
@@ -97,12 +97,15 @@
importExportMeterWaterDto = BeanConvertUtil.covertBean(tmpRoomDto, ImportExportMeterWaterDto.class);
String preDegree = "0";
String preReadTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B);
+ double price = 0;
if (meterWaterDtos != null && meterWaterDtos.size() > 0) {
preDegree = meterWaterDtos.get(0).getCurDegrees();
preReadTime = DateUtil.dateTimeToDate(meterWaterDtos.get(0).getCurReadingTime());
+ price = meterWaterDtos.get(0).getPrice();
}
importExportMeterWaterDto.setPreDegrees(preDegree);
importExportMeterWaterDto.setPreReadingTime(preReadTime);
+ importExportMeterWaterDto.setPrice(price);
importExportMeterWaterDtos.add(importExportMeterWaterDto);
}
return ResultVo.createResponseEntity(1, importExportMeterWaterDtos.size(), importExportMeterWaterDtos);
@@ -204,8 +207,10 @@
if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
feeName += "姘磋垂";
- } else {
+ } else if("2020".equals(importExportMeterWaterDto.getMeterType())) {
feeName += "鐢佃垂";
+ }else{
+ feeName += "鐕冩皵璐�";
}
feeAttrPo.setValue(feeName);
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -265,6 +270,7 @@
meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
+ meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
meterWaterPos.add(meterWaterPo);
}
--
Gitblit v1.8.0