From f6cd133f2676c66d8cb45177ac5ba3ee682d6879 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 14 一月 2021 23:25:10 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
index 7d92e39..86a543f 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
@@ -34,7 +34,6 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;
-import java.util.concurrent.Callable;
/**
* @ClassName AssetImportSmoImpl
@@ -177,7 +176,7 @@
row.createCell(1).setCellValue("鎴垮彿锛�" + room.getString("floorNum")
+ "-" + room.getString("unitNum")
+ "-" + room.getString("roomNum"));
- row.createCell(2).setCellValue("涓氫富锛�" + room.getString("ownerName"));
+ row.createCell(2).setCellValue("");
row.createCell(3).setCellValue(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
row = sheet.createRow(2 + line);
@@ -191,14 +190,18 @@
JSONArray fees = room.getJSONArray("fees");
BigDecimal totalPrice = new BigDecimal(0);
+ String startTime = "";
+ String endTime = "";
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
JSONObject feeObj = fees.getJSONObject(feeIndex);
row = sheet.createRow(line + feeIndex + 3);
row.createCell(0).setCellValue(feeObj.getString("feeName"));
row.createCell(1).setCellValue(feeObj.getString("squarePrice"));
row.createCell(2).setCellValue(room.getString("builtUpArea"));
- row.createCell(3).setCellValue(feeObj.getString("endTime") + "鑷�" + feeObj.getString("deadlineTime"));
- row.createCell(4).setCellValue(room.getString("feePrice"));
+ startTime= feeObj.getString("endTime").length()>10?feeObj.getString("endTime").substring(0,10):feeObj.getString("endTime");
+ endTime= feeObj.getString("deadlineTime").length()>10?feeObj.getString("deadlineTime").substring(0,10):feeObj.getString("deadlineTime");
+ row.createCell(3).setCellValue(startTime + "鑷�" + endTime);
+ row.createCell(4).setCellValue(feeObj.getString("feePrice"));
row.createCell(5).setCellValue("0");
row.createCell(6).setCellValue("");
totalPrice.add(new BigDecimal(feeObj.getString("squarePrice")));
@@ -215,7 +218,7 @@
row = sheet.createRow(line + fees.size() + 4);
row.createCell(0).setCellValue("1銆佽鏀跺埌閫氱煡鍗�5鏃ュ唴鍒扮墿涓氬鎴栧井淇℃敮浠�");
- row = sheet.createRow(fees.size() + 5);
+ row = sheet.createRow(line + fees.size() + 5);
row.createCell(0).setCellValue("2銆侀�炬湡鏈即锛屽皢鎸夎瀹氭敹鍙栬繚绾﹂噾锛屼細缁欐偍鐓ф垚涓嶅繀瑕佺殑鎹熷け");
return line + fees.size() + 4;
@@ -327,7 +330,7 @@
}
public static void main(String[] args) {
- Java110ThreadPoolFactory<String> pool =Java110ThreadPoolFactory.getInstance().createThreadPool(20);
+ Java110ThreadPoolFactory<String> pool = Java110ThreadPoolFactory.getInstance().createThreadPool(20);
for (int i = 21; i > 0; i--) {
Integer data = i;
pool.submit(() -> {
@@ -335,7 +338,7 @@
System.out.println("缃戠粶鎿嶄綔寮�濮�" + data);
Thread.sleep(data * 1000);
System.out.println("缃戠粶鎿嶄綔缁撴潫" + data);
- return data+"";
+ return data + "";
});
}
List<String> users = pool.get();
--
Gitblit v1.8.0