From 49e81b765077fdba50c7c679e0abdb5f188f8037 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 19 五月 2021 16:59:13 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportFeeDetailSMOImpl.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 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
old mode 100644
new mode 100755
index 492c013..7cf7e12
--- 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
@@ -5,6 +5,7 @@
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.fee.FeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IImportFeeDetailSMO;
@@ -54,19 +55,75 @@
try {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰涓湭鍖呭惈灏忓尯");
+ Assert.hasKeyAndValue(paramIn, "objType", "璇锋眰涓湭鍖呭惈璐圭敤瀵硅薄");
//InputStream is = uploadFile.getInputStream();
Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile); //宸ヤ綔绨�
List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
-
- //鑾峰彇妤间俊鎭�
- getRooms(workbook, rooms);
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(paramIn.getString("objType"))) {
+ //鑾峰彇妤间俊鎭�
+ getRooms(workbook, rooms);
+ }else {
+ //鑾峰彇妤间俊鎭�
+ getCars(workbook, rooms);
+ }
// 淇濆瓨鏁版嵁
return dealExcelData(pd, rooms, result);
} catch (Exception e) {
logger.error("瀵煎叆澶辫触 ", e);
return new ResponseEntity<String>("闈炲父鎶辨瓑锛屾偍濉啓鐨勬ā鏉挎暟鎹湁璇細" + e.getMessage(), HttpStatus.BAD_REQUEST);
+ }
+ }
+
+ private void getCars(Workbook workbook, List<ImportRoomFee> rooms) {
+ Sheet sheet = null;
+ sheet = ImportExcelUtils.getSheet(workbook, "杞﹁締缂磋垂鍘嗗彶");
+ List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ ImportRoomFee importRoomFee = null;
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+
+ //璐圭敤鍚嶇О娌℃湁濉啓锛岄粯璁よ烦杩�
+ if (StringUtil.isNullOrNone(os[4])) {
+ continue;
+ }
+ Assert.hasValue(os[0], (osIndex + 1) + "琛岃溅鐗屽彿涓嶈兘涓虹┖");
+ 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) + "琛岀即璐归噾棰濅笉鑳戒负绌�");
+
+//
+
+ String startTime = excelDoubleToDate(os[3].toString());
+ String endTime = excelDoubleToDate(os[4].toString());
+ String createTime = excelDoubleToDate(os[5].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();
+ importRoomFee.setCarNum(os[0].toString());
+ importRoomFee.setFeeName(os[1].toString());
+ importRoomFee.setCycle(os[2].toString());
+ importRoomFee.setStartTime(startTime);
+ importRoomFee.setEndTime(endTime);
+ importRoomFee.setCreateTime(createTime);
+ importRoomFee.setAmount(os[6].toString());
+ importRoomFee.setRemark(!StringUtil.isNullOrNone(os[7]) ? os[7].toString() : "");
+ rooms.add(importRoomFee);
}
}
@@ -166,16 +223,20 @@
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) + "琛岀即璐规椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[8], (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());
+ 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();
@@ -183,10 +244,12 @@
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.setCreateTime(createTime);
+ importRoomFee.setAmount(os[8].toString());
+ importRoomFee.setRemark(!StringUtil.isNullOrNone(os[9]) ? os[9].toString() : "");
rooms.add(importRoomFee);
}
}
--
Gitblit v1.8.0