From dcccbe98ad80e67d4712447ac9f2f9362842256a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 09 九月 2020 17:11:16 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
index 492c013..a40cf6f 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java
@@ -166,14 +166,15 @@
Assert.hasValue(os[1], (osIndex + 1) + "琛屽崟鍏冪紪鍙蜂笉鑳戒负绌�");
Assert.hasValue(os[2], (osIndex + 1) + "琛屾埧灞嬬紪鍙蜂笉鑳戒负绌�");
Assert.hasValue(os[3], (osIndex + 1) + "琛屾敹璐归」鐩笉鑳戒负绌�");
- Assert.hasValue(os[4], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[5], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[6], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[4], (osIndex + 1) + "琛岀即璐瑰懆鏈熶笉鑳戒负绌�");
+ Assert.hasValue(os[5], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[6], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[7], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
//
- String startTime = excelDoubleToDate(os[4].toString());
- String endTime = excelDoubleToDate(os[5].toString());
+ String startTime = excelDoubleToDate(os[5].toString());
+ String endTime = excelDoubleToDate(os[6].toString());
Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
@@ -183,10 +184,11 @@
importRoomFee.setUnitNum(os[1].toString());
importRoomFee.setRoomNum(os[2].toString());
importRoomFee.setFeeName(os[3].toString());
+ importRoomFee.setCycle(os[4].toString());
importRoomFee.setStartTime(startTime);
importRoomFee.setEndTime(endTime);
- importRoomFee.setAmount(os[6].toString());
- importRoomFee.setRemark(StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
+ importRoomFee.setAmount(os[7].toString());
+ importRoomFee.setRemark(StringUtil.isNullOrNone(os[8]) ? os[8].toString() : "");
rooms.add(importRoomFee);
}
}
--
Gitblit v1.8.0