From 979ddae1450771e1546e7adca7ad9916f51215be Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 二月 2025 19:10:30 +0800
Subject: [PATCH] 优化报表支持按时间段
---
service-job/src/main/java/com/java110/job/export/adapt/DataReportOweStatisticsAdapt.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/DataReportOweStatisticsAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/DataReportOweStatisticsAdapt.java
index 2f2c4e0..c6d4012 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/DataReportOweStatisticsAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/DataReportOweStatisticsAdapt.java
@@ -8,6 +8,7 @@
import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
import com.java110.job.export.IExportDataAdapt;
import com.java110.utils.util.Assert;
+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;
@@ -52,17 +53,14 @@
Sheet sheet = workbook.createSheet("娆犺垂缁熻");
Row row = sheet.createRow(0);
row.createCell(0).setCellValue("妤兼爧");
- row.createCell(1).setCellValue("鎴锋暟");
- row.createCell(2).setCellValue("鏀惰垂鎴锋暟");
- row.createCell(3).setCellValue("娆犺垂鎴锋暟");
- row.createCell(4).setCellValue("娆犺垂");
+ row.createCell(1).setCellValue("娆犺垂");
DictDto dictDto = new DictDto();
dictDto.setTableName("pay_fee_config");
dictDto.setTableColumns("fee_type_cd_show");
List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
- row.createCell(5 + dictIndex).setCellValue(dictDtos.get(dictIndex).getName());
+ row.createCell(2 + dictIndex).setCellValue(dictDtos.get(dictIndex).getName());
}
QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
@@ -87,6 +85,7 @@
/**
* 灏佽鏁版嵁鍒癊xcel涓�
+ *
* @param datas
* @param sheet
* @param dictDtos
@@ -99,24 +98,25 @@
row = sheet.createRow(roomIndex + 1);
dataObj = datas.get(roomIndex);
row.createCell(0).setCellValue(dataObj.get("floorNum").toString());
- row.createCell(1).setCellValue(dataObj.get("roomCount").toString());
- row.createCell(2).setCellValue(dataObj.get("feeRoomCount").toString());
- row.createCell(3).setCellValue(dataObj.get("oweRoomCount").toString());
- row.createCell(4).setCellValue(dataObj.get("oweFee").toString());
+ row.createCell(1).setCellValue(dataObj.get("oweFee").toString());
for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
+ if (!dataObj.containsKey("oweFee" + dictDtos.get(dictIndex).getStatusCd())) {
+ row.createCell(2 + dictIndex).setCellValue("0");
+ continue;
+ }
oweFee = dataObj.get("oweFee" + dictDtos.get(dictIndex).getStatusCd()).toString();
if (StringUtil.isEmpty(oweFee)) {
oweFee = "0";
}
- row.createCell(5 + dictIndex).setCellValue(oweFee);
+ row.createCell(2 + dictIndex).setCellValue(oweFee);
}
}
}
private List<Map> computeOweReceivedFee(List<Map> datas) {
- if (datas == null || datas.size() < 1) {
+ if (ListUtil.isNull(datas)) {
return new ArrayList<>();
}
@@ -127,7 +127,7 @@
}
}
- if (tmpDatas == null || tmpDatas.size() < 1) {
+ if (ListUtil.isNull(tmpDatas)) {
return new ArrayList<>();
}
--
Gitblit v1.8.0