From b63f41b8a0cfce68770e5cb02c8dd3fd994f0c59 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 22 七月 2025 18:37:54 +0800
Subject: [PATCH] 修改费用导入模块2025/07/22
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
index b28633e..82a3c10 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomFeeDataCleaningAdapt.java
@@ -18,7 +18,9 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 涓�娆℃�ц垂鐢ㄥ鍏�
@@ -33,27 +35,88 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+// @Override
+// public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {
+// List<ImportRoomFee> importRoomFees = new ArrayList<ImportRoomFee>();
+// if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(paramIn.getString("objType"))) {
+// getRooms(workbook, importRoomFees);
+// }else{
+// getCars(workbook, importRoomFees);
+// }
+//// getRoomsAndCars(workbook, importRoomFees);
+// generatorBatch(paramIn);
+// for (ImportRoomFee importRoomFee : importRoomFees) {
+// importRoomFee.setBatchId(paramIn.getString("batchId"));
+// importRoomFee.setUserId(paramIn.getString("userId"));
+// importRoomFee.setStoreId(paramIn.getString("storeId"));
+// importRoomFee.setCommunityId(paramIn.getString("communityId"));
+// importRoomFee.setFeeTypeCd(paramIn.getString("feeTypeCd"));
+// importRoomFee.setObjType(paramIn.getString("objType"));
+//
+// }
+// return importRoomFees;
+// }
+
@Override
public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {
List<ImportRoomFee> importRoomFees = new ArrayList<ImportRoomFee>();
- if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(paramIn.getString("objType"))) {
- getRooms(workbook, importRoomFees);
- }else{
- getCars(workbook, importRoomFees);
- }
+ getRoomsAndCars(workbook, importRoomFees);
generatorBatch(paramIn);
for (ImportRoomFee importRoomFee : importRoomFees) {
importRoomFee.setBatchId(paramIn.getString("batchId"));
importRoomFee.setUserId(paramIn.getString("userId"));
importRoomFee.setStoreId(paramIn.getString("storeId"));
importRoomFee.setCommunityId(paramIn.getString("communityId"));
- importRoomFee.setFeeTypeCd(paramIn.getString("feeTypeCd"));
+// importRoomFee.setFeeTypeCd(paramIn.getString("feeTypeCd"));
importRoomFee.setObjType(paramIn.getString("objType"));
-
}
return importRoomFees;
}
+ private void getRoomsAndCars(Workbook workbook, List<ImportRoomFee> importRoomFees) {
+ Sheet sheet = null;
+ sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
+ List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ ImportRoomFee importRoomFee = null;
+ Map<Integer, Object> debugs = new HashMap<Integer, Object>();
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (os[2] == null) {
+ continue;
+ }
+ if ((StringUtil.isNullOrNone(os[0]) && StringUtil.isNullOrNone(os[1])) || (!StringUtil.isNullOrNone(os[0]) && !StringUtil.isNullOrNone(os[1]))) {
+ Assert.hasValue(os[2], (osIndex + 1) + "琛岃鍐欏叆璐圭敤涓讳綋鍜岃溅鐗屽彿鍏朵腑涓�鍒�");
+ continue;
+ }
+ Assert.hasValue(os[2], (osIndex + 1) + "琛岃垂鐢ㄧ被鍨嬩笉鑳戒负绌�");
+ Assert.hasValue(os[3], (osIndex + 1) + "琛岃垂鐢ㄩ」鐩笉鑳戒负绌�");
+
+ String startTime = handleExcelDateString(os[4].toString());
+ String endTime = handleExcelDateString(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 鏂囨湰鏍煎紡");
+
+
+ importRoomFee = new ImportRoomFee();
+ importRoomFee.setPayerObjName(os[0]==null?os[1].toString():os[0].toString());
+// importRoomFee.set
+ importRoomFee.setFeeTypeCd(os[2].toString());
+
+ importRoomFee.setFeeName(os[3].toString());
+ if(startTime != null){
+ importRoomFee.setStartTime(startTime);
+ }
+ if(endTime != null){
+ importRoomFee.setEndTime(endTime);
+ }
+ importRoomFee.setAmount(os[7].toString());
+ importRoomFees.add(importRoomFee);
+ }
+ }
+
/**
* 鑾峰彇 鎴垮眿淇℃伅
*
--
Gitblit v1.8.0