From 979ddae1450771e1546e7adca7ad9916f51215be Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 二月 2025 19:10:30 +0800
Subject: [PATCH] 优化报表支持按时间段
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index 36d1d6e..901de20 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -12,6 +12,7 @@
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -1617,15 +1618,15 @@
row.createCell(3).setCellValue("涓氫富鐢佃瘽");
row.createCell(4).setCellValue("闈㈢Н");
row.createCell(5).setCellValue("璐圭敤椤�");
- row.createCell(6).setCellValue("璐圭敤寮�濮嬫椂闂�");
- row.createCell(7).setCellValue("鏇存柊鏃堕棿");
+ row.createCell(6).setCellValue("寮�濮嬫椂闂�");
+ row.createCell(7).setCellValue("缁撴潫鏃堕棿");
row.createCell(8).setCellValue("娆犺垂鏃堕暱锛堝ぉ锛�");
row.createCell(9).setCellValue("娆犺垂鏃堕暱锛堟湀锛�");
row.createCell(10).setCellValue("娆犺垂閲戦");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportOweFeeDetail(pd, result);
- if (rooms == null || rooms.size() == 0) {
+ if (ListUtil.isNull(rooms)) {
return;
}
JSONObject dataObj = null;
@@ -1639,8 +1640,8 @@
row.createCell(3).setCellValue(dataObj.getString("ownerTel"));
row.createCell(4).setCellValue(dataObj.getString("builtUpArea"));
row.createCell(5).setCellValue(dataObj.getString("feeName"));
- row.createCell(6).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(7).setCellValue(dataObj.getString("updateTime"));
+ row.createCell(6).setCellValue(dataObj.getString("startTime"));
+ row.createCell(7).setCellValue(dataObj.getString("endTime"));
row.createCell(8).setCellValue(dataObj.getString("oweDay"));
monthDec = new BigDecimal(dataObj.getString("oweDay"));
monthDec = monthDec.divide(new BigDecimal("30"), 2, BigDecimal.ROUND_HALF_UP);
--
Gitblit v1.8.0