From 17a9b195ece2f2e3de3682c086ecec0970fbe210 Mon Sep 17 00:00:00 2001
From: sangzhigang <sangzhigang@hongruiinfo.com>
Date: 星期二, 28 十二月 2021 19:18:17 +0800
Subject: [PATCH] 1、优化报修增加报修设置类型，2、增加业主车辆批量导入3、优化相关bug
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..b0ff2a5 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
@@ -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