From 4e5b8cad8abbd56d373d27905a43524572638591 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 16:37:06 +0800
Subject: [PATCH] 优化退款逻辑
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 0230b8d..0d52212 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
@@ -17,7 +17,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -887,12 +887,13 @@
row.createCell(4).setCellValue("鐗╁搧鍚嶇О");
row.createCell(5).setCellValue("鐗╁搧瑙勬牸");
row.createCell(6).setCellValue("鏄惁鏄浐瀹氱墿鍝�");
- row.createCell(7).setCellValue("鐗╁搧浣跨敤鏁伴噺");
- row.createCell(8).setCellValue("鐗╁搧浠锋牸");
- row.createCell(9).setCellValue("浣跨敤浜篒D");
- row.createCell(10).setCellValue("浣跨敤浜�");
- row.createCell(11).setCellValue("鍒涘缓鏃堕棿");
- row.createCell(12).setCellValue("澶囨敞");
+ row.createCell(7).setCellValue("鐗╁搧浣跨敤绫诲瀷");
+ row.createCell(8).setCellValue("鐗╁搧浣跨敤鏁伴噺");
+ row.createCell(9).setCellValue("鐗╁搧浠锋牸");
+ row.createCell(10).setCellValue("浣跨敤浜篒D");
+ row.createCell(11).setCellValue("浣跨敤浜�");
+ row.createCell(12).setCellValue("鍒涘缓鏃堕棿");
+ row.createCell(13).setCellValue("澶囨敞");
JSONArray resourceStoreUseRecords = this.getResourceStoreUseRecordManage(pd, result);
if (resourceStoreUseRecords == null || resourceStoreUseRecords.size() == 0) {
return;
@@ -908,12 +909,13 @@
row.createCell(4).setCellValue(dataObj.getString("resourceStoreName"));
row.createCell(5).setCellValue(dataObj.getString("specName"));
row.createCell(6).setCellValue(dataObj.getString("isFixedName"));
- row.createCell(7).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
- row.createCell(8).setCellValue(dataObj.getString("unitPrice"));
- row.createCell(9).setCellValue(dataObj.getString("createUserId"));
- row.createCell(10).setCellValue(dataObj.getString("createUserName"));
- row.createCell(11).setCellValue(dataObj.getString("createTime"));
- row.createCell(12).setCellValue(dataObj.getString("remark"));
+ row.createCell(7).setCellValue(dataObj.getString("stateName"));
+ row.createCell(8).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(9).setCellValue(dataObj.getString("unitPrice"));
+ row.createCell(10).setCellValue(dataObj.getString("createUserId"));
+ row.createCell(11).setCellValue(dataObj.getString("createUserName"));
+ row.createCell(12).setCellValue(dataObj.getString("createTime"));
+ row.createCell(13).setCellValue(dataObj.getString("remark"));
}
}
--
Gitblit v1.8.0