From acb14e4abc643f05dd641b2b08e2b449132dfce2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 23 十二月 2020 08:54:31 +0800
Subject: [PATCH] 优化 相关代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 a40cf6f..efc31bd 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
@@ -169,14 +169,17 @@
Assert.hasValue(os[4], (osIndex + 1) + "琛岀即璐瑰懆鏈熶笉鑳戒负绌�");
Assert.hasValue(os[5], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
Assert.hasValue(os[6], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
- Assert.hasValue(os[7], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
+ Assert.hasValue(os[7], (osIndex + 1) + "琛岀即璐规椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
//
String startTime = excelDoubleToDate(os[5].toString());
String endTime = excelDoubleToDate(os[6].toString());
+ String createTime = excelDoubleToDate(os[7].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 鏂囨湰鏍煎紡");
+ Assert.isDate(createTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
importRoomFee = new ImportRoomFee();
@@ -187,8 +190,9 @@
importRoomFee.setCycle(os[4].toString());
importRoomFee.setStartTime(startTime);
importRoomFee.setEndTime(endTime);
- importRoomFee.setAmount(os[7].toString());
- importRoomFee.setRemark(StringUtil.isNullOrNone(os[8]) ? os[8].toString() : "");
+ importRoomFee.setCreateTime(createTime);
+ importRoomFee.setAmount(os[8].toString());
+ importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
rooms.add(importRoomFee);
}
}
--
Gitblit v1.8.0