From 7dd0025424f01dda86103d48b34ea03c9aed6ab2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 三月 2023 00:57:41 +0800
Subject: [PATCH] 加入充电规则功能
---
service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java
index 77a945e..0db7fc1 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java
@@ -7,6 +7,7 @@
import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
import com.java110.job.export.IExportDataAdapt;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Row;
@@ -27,7 +28,7 @@
@Autowired
private IQueryPayFeeDetailInnerServiceSMO queryPayFeeDetailInnerServiceSMOImpl;
- private static final int MAX_ROW = 100;
+ private static final int MAX_ROW = 200;
@Override
@@ -61,7 +62,7 @@
row.createCell(17).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
row.createCell(18).setCellValue("闈㈢Н");
row.createCell(19).setCellValue("杞︿綅");
-
+ row.createCell(20).setCellValue("璐︽埛鎶垫墸");
JSONObject reqJson = exportDataDto.getReqJson();
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = BeanConvertUtil.covertBean(reqJson,ReportFeeMonthStatisticsDto.class);
@@ -118,7 +119,7 @@
row.createCell(6).setCellValue(dataObj.getString("primeRate"));
row.createCell(7).setCellValue(dataObj.getString("startTime"));
row.createCell(8).setCellValue(dataObj.getString("endTime"));
- row.createCell(9).setCellValue(dataObj.getString("createTime"));
+ row.createCell(9).setCellValue(DateUtil.getFormatTimeString(dataObj.getDate("createTime"),DateUtil.DATE_FORMATE_STRING_A));
row.createCell(10).setCellValue(dataObj.getDouble("receivableAmount"));
row.createCell(11).setCellValue(dataObj.getDouble("receivedAmount"));
row.createCell(12).setCellValue(dataObj.getDouble("preferentialAmount"));
@@ -129,6 +130,8 @@
row.createCell(17).setCellValue(dataObj.getDouble("vacantHousingReduction"));
row.createCell(18).setCellValue(dataObj.getString("builtUpArea"));
row.createCell(19).setCellValue(dataObj.getString("psName"));
+ row.createCell(20).setCellValue(dataObj.getString("withholdAmount"));
+
}
}
}
--
Gitblit v1.8.0