From 7fca0ff445f4c19d547daf71b47201505cb2b9c0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 01 十一月 2023 14:36:22 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 656e37f..93e4b62 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.data.ExportDataDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.reportFee.ReportFeeMonthStatisticsDto;
import com.java110.intf.report.IQueryPayFeeDetailInnerServiceSMO;
import com.java110.job.export.IExportDataAdapt;
@@ -15,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -100,8 +102,11 @@
List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos = (List<ReportFeeMonthStatisticsDto>) resultVo.getData();
Row row = null;
JSONObject dataObj = null;
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = null;
+ Date endDate = null;
for (int roomIndex = 0; roomIndex < reportFeeMonthStatisticsDtos.size(); roomIndex++) {
row = sheet.createRow(roomIndex + step + 1);
+ reportFeeMonthStatisticsDto = reportFeeMonthStatisticsDtos.get(roomIndex);
dataObj = JSONObject.parseObject(JSONObject.toJSONString(reportFeeMonthStatisticsDtos.get(roomIndex)));
row.createCell(0).setCellValue(dataObj.getString("oId"));
if (!StringUtil.isEmpty(dataObj.getString("payerObjType")) && dataObj.getString("payerObjType").equals("3333")) { //鎴垮眿
@@ -109,14 +114,21 @@
} else {
row.createCell(1).setCellValue(dataObj.getString("objName"));
}
+ endDate = DateUtil.getDateFromStringB(dataObj.getString("endTime"));
+ //todo 濡傛灉涓嶆槸涓�娆℃�ц垂鐢ㄧ粨鏉熸椂闂村缓1
+ if(!StringUtil.isEmpty(reportFeeMonthStatisticsDto.getFeeFlag())
+ && !FeeDto.FEE_FLAG_ONCE.equals(reportFeeMonthStatisticsDto.getFeeFlag())){
+ endDate = DateUtil.stepDay(endDate,-1);
+ }
+
row.createCell(2).setCellValue(dataObj.getString("ownerName"));
row.createCell(3).setCellValue(dataObj.getString("feeName"));
row.createCell(4).setCellValue(dataObj.getString("feeTypeCdName"));
row.createCell(5).setCellValue(dataObj.getString("stateName"));
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(DateUtil.getFormatTimeString(dataObj.getDate("createTime"), DateUtil.DATE_FORMATE_STRING_A));
+ row.createCell(8).setCellValue(DateUtil.getFormatTimeStringB(endDate));
+ row.createCell(9).setCellValue(DateUtil.getFormatTimeStringA(dataObj.getDate("createTime")));
row.createCell(10).setCellValue(dataObj.getDouble("receivableAmount"));
row.createCell(11).setCellValue(dataObj.getDouble("receivedAmount"));
row.createCell(12).setCellValue(dataObj.getDouble("preferentialAmount"));
--
Gitblit v1.8.0