From bbf3d14567fb58e475e235168760080b9d07730d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 03 十一月 2023 14:55:34 +0800
Subject: [PATCH] 优化房屋费用报表
---
service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java
index 50d67e1..8885a09 100644
--- a/service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/admin/GetParkingFeeSummaryCmd.java
@@ -62,22 +62,21 @@
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
- if(!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))){
+ if (!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))) {
reqJson.put("startTime", year + "-01-01");
}
- if(!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))){
+ if (!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))) {
reqJson.put("endTime", (year + 1) + "-01-01");
}
//todo 鏌ヨ鎴垮眿鐗╀笟璐逛俊鎭�
- if(reqJson.containsKey("psName") && !StringUtil.isEmpty(reqJson.getString("psName"))){
- String[] psNames = reqJson.getString("psName").split("-",2);
- if(psNames.length != 2){
+ if (reqJson.containsKey("psName") && !StringUtil.isEmpty(reqJson.getString("psName"))) {
+ String[] psNames = reqJson.getString("psName").split("-", 2);
+ if (psNames.length != 2) {
throw new CmdException("杞︿綅缂栧彿閿欒");
}
- reqJson.put("paNum",psNames[0]);
- reqJson.put("psNum",psNames[1]);
+ reqJson.put("paNum", psNames[0]);
+ reqJson.put("psNum", psNames[1]);
}
-
// todo 鏌ヨ鎬绘暟閲�
@@ -116,20 +115,20 @@
storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
- for(CommunityDto tmpCommunityDto : communityDtos){
- for(StoreDto tmpStoreDto: storeDtos){
- if(tmpStoreDto.getStoreId().equals(tmpCommunityDto.getStoreId())){
+ for (CommunityDto tmpCommunityDto : communityDtos) {
+ for (StoreDto tmpStoreDto : storeDtos) {
+ if (tmpStoreDto.getStoreId().equals(tmpCommunityDto.getStoreId())) {
tmpCommunityDto.setStoreName(tmpStoreDto.getName());
}
}
}
- for(Map info: infos){
- for(CommunityDto tmpCommunityDto : communityDtos){
- if(info.get("communityId").equals(tmpCommunityDto.getCommunityId())){
- info.put("communityName",tmpCommunityDto.getName());
- info.put("storeId",tmpCommunityDto.getStoreId());
- info.put("storeName",tmpCommunityDto.getStoreName());
+ for (Map info : infos) {
+ for (CommunityDto tmpCommunityDto : communityDtos) {
+ if (info.get("communityId").equals(tmpCommunityDto.getCommunityId())) {
+ info.put("communityName", tmpCommunityDto.getName());
+ info.put("storeId", tmpCommunityDto.getStoreId());
+ info.put("storeName", tmpCommunityDto.getStoreName());
}
}
}
@@ -156,6 +155,9 @@
for (Map roomInfo : infos) {
months = new ArrayList<>();
for (Map monthInfo : monthDatas) {
+ if (roomInfo.get("configId") == null || monthInfo.get("configId") == null) {
+ continue;
+ }
if (roomInfo.get("carId").equals(monthInfo.get("roomId"))
&& roomInfo.get("configId").equals(monthInfo.get("configId"))) {
months.add(monthInfo);
--
Gitblit v1.8.0