From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈
---
service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
old mode 100644
new mode 100755
index eaa3875..658c9b7
--- a/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java
@@ -183,20 +183,16 @@
}
//鏌ヨ璐圭敤淇℃伅arrearsEndTime
List<RoomDto> tmpRoomDtos = new ArrayList<>();
- //List<RoomDto> tempRooms = new ArrayList<>();
+ List<RoomDto> tempRooms = new ArrayList<>();
int threadNum = Java110ThreadPoolFactory.JAVA110_DEFAULT_THREAD_NUM;
- //for (int roomIndex = 0; roomIndex < roomDtos.size(); roomIndex++) {
- // tempRooms.add(roomDtos.get(roomIndex));
- //if (roomIndex % threadNum == 0 && roomIndex != 0) {
- // tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, threadNum));
- // tempRooms = new ArrayList();
- // }
- // }
-// if (tempRooms.size() > 0) {
-// tmpRoomDtos.addAll(doGetTmpRoomDto(tempRooms, feeDto, tempRooms.size()));
-// }
- tmpRoomDtos.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
+ tempRooms.addAll(doGetTmpRoomDto(roomDtos, feeDto, threadNum));
+ for(RoomDto tmpRoomDto:tempRooms){
+ if(tmpRoomDto == null){
+ continue;
+ }
+ tmpRoomDtos.add(tmpRoomDto);
+ }
return ResultVo.createResponseEntity(tmpRoomDtos);
}
@@ -583,7 +579,9 @@
return targetEndDateAndOweMonth;
}
if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
- if (!StringUtil.isEmpty(feeDto.getCurDegrees())) {
+ if(feeDto.getDeadlineTime() != null){
+ targetEndDate = feeDto.getDeadlineTime();
+ }else if(!StringUtil.isEmpty(feeDto.getCurDegrees())) {
targetEndDate = feeDto.getCurReadingTime();
} else if (feeDto.getImportFeeEndTime() == null) {
targetEndDate = feeDto.getConfigEndTime();
--
Gitblit v1.8.0