From cc7ea8cafd230d7b3d9bfeefcd293632439bc397 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 22 十一月 2020 15:58:27 +0800
Subject: [PATCH] 优化代码 加入 费用抄表导出功能
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 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 6c10304..90eedf9 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
@@ -2,12 +2,16 @@
import com.alibaba.fastjson.JSONArray;
import com.java110.dto.RoomDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.meterWater.ImportExportMeterWaterDto;
import com.java110.dto.meterWater.MeterWaterDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.fee.bmo.meterWater.IQueryPreMeterWater;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IMeterWaterInnerServiceSMO;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
@@ -16,6 +20,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -48,6 +53,31 @@
return ResultVo.createResponseEntity(1, total, meterWaterDtos);
}
+ @Override
+ public ResponseEntity<String> queryExportRoomAndMeterWater(String communityId, String meterType) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(communityId);
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ MeterWaterDto meterWaterDto = null;
+ List<ImportExportMeterWaterDto> importExportMeterWaterDtos = new ArrayList<>();
+ ImportExportMeterWaterDto importExportMeterWaterDto = null;
+ for (RoomDto tmpRoomDto : roomDtos) {
+ meterWaterDto = new MeterWaterDto();
+ meterWaterDto.setMeterType(meterType);
+ meterWaterDto.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ 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();
+
+ importExportMeterWaterDto.setPreDegrees(preDegree);
+ importExportMeterWaterDto.setPreReadingTime(preReadTime);
+ importExportMeterWaterDtos.add(importExportMeterWaterDto);
+ }
+ return ResultVo.createResponseEntity(1, importExportMeterWaterDtos.size(), importExportMeterWaterDtos);
+ }
+
private boolean freshFeeDtoParam(MeterWaterDto meterWaterDto, String roomNum) {
if (StringUtil.isEmpty(roomNum)) {
--
Gitblit v1.8.0