From 6965916e5ef0c83b8ea4a8001be21e6f0f274a69 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 05 六月 2023 10:53:26 +0800
Subject: [PATCH] optimize code

---
 service-job/src/main/java/com/java110/job/export/adapt/DataReportEarnedStatisticsAdapt.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/export/adapt/DataReportEarnedStatisticsAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/DataReportEarnedStatisticsAdapt.java
index 56169cc..d2ddd55 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/DataReportEarnedStatisticsAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/DataReportEarnedStatisticsAdapt.java
@@ -1,16 +1,13 @@
 package com.java110.job.export.adapt;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.Dict.DictDto;
 import com.java110.dto.data.ExportDataDto;
-import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.report.QueryStatisticsDto;
 import com.java110.intf.dev.IDictV1InnerServiceSMO;
 import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
 import com.java110.job.export.IExportDataAdapt;
 import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -57,13 +54,14 @@
         row.createCell(0).setCellValue("妤兼爧");
         row.createCell(1).setCellValue("鎴锋暟");
         row.createCell(2).setCellValue("鏀惰垂鎴锋暟");
+        row.createCell(3).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(3 + dictIndex).setCellValue(dictDtos.get(dictIndex).getName());
+            row.createCell(4 + dictIndex).setCellValue(dictDtos.get(dictIndex).getName());
         }
 
         QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
@@ -86,10 +84,15 @@
         return workbook;
     }
 
+    /**
+     * 灏佽鏁版嵁鍒癊xcel涓�
+     * @param datas
+     * @param sheet
+     * @param dictDtos
+     */
     private void appendData(List<Map> datas, Sheet sheet, List<DictDto> dictDtos) {
         Row row = null;
         Map dataObj = null;
-        String oweFee = "";
         String receivedFee = "";
         for (int roomIndex = 0; roomIndex < datas.size(); roomIndex++) {
             row = sheet.createRow(roomIndex + 1);
@@ -97,13 +100,14 @@
             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("receivedFee").toString());
 
             for (int dictIndex = 0; dictIndex < dictDtos.size(); dictIndex++) {
-                oweFee = dataObj.get("oweFee" + dictDtos.get(0).getStatusCd()).toString();
-                if (StringUtil.isEmpty(oweFee)) {
-                    oweFee = "0";
+                receivedFee = dataObj.get("receivedFee" + dictDtos.get(dictIndex).getStatusCd()).toString();
+                if (StringUtil.isEmpty(receivedFee)) {
+                    receivedFee = "0";
                 }
-                row.createCell(3 + dictIndex).setCellValue(oweFee);
+                row.createCell(4 + dictIndex).setCellValue(receivedFee);
             }
         }
 

--
Gitblit v1.8.0