From df514d4a109ca512830c55de30d4c558f3dc9c73 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 03 十一月 2023 12:15:32 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java
index 21aa790..21c3584 100644
--- a/service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/admin/GetPropertyFeeSummaryCmd.java
@@ -13,6 +13,7 @@
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.store.IStoreV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -60,9 +61,16 @@
int row = reqJson.getIntValue("row");
Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
+
+ if(!reqJson.containsKey("startTime") || StringUtil.isEmpty(reqJson.getString("startTime"))){
+ reqJson.put("startTime", year + "-01-01");
+ }
+ if(!reqJson.containsKey("endTime") || StringUtil.isEmpty(reqJson.getString("endTime"))){
+ reqJson.put("endTime", (year + 1) + "-01-01");
+ }
//todo 鏌ヨ鎴垮眿鐗╀笟璐逛俊鎭�
- reqJson.put("startTime", year + "-01-01");
- reqJson.put("endTime", (year + 1) + "-01-01");
+
+
// todo 鏌ヨ鎬绘暟閲�
int total = baseDataStatisticsInnerServiceSMOImpl.getPropertyFeeSummaryDataCount(reqJson);
--
Gitblit v1.8.0