From a26c074129afced8fe87e300fb501030fde0c056 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期五, 04 七月 2025 18:38:29 +0800
Subject: [PATCH] 添加二级费用项
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java | 65 +++++---------------------------
1 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
index 9c359b9..a63ff11 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportMeterWaterFeeDataCleaningAdapt.java
@@ -3,19 +3,17 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.importData.ImportRoomFee;
import com.java110.dto.meter.ImportExportMeterWaterDto;
-import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.system.ComponentValidateResult;
-import com.java110.dto.user.UserDto;
-import com.java110.po.payFee.PayFeeBatchPo;
+import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -27,16 +25,17 @@
*/
@Service("importMeterWaterFeeDataCleaning")
public class ImportMeterWaterFeeDataCleaningAdapt extends DefaultImportDataAdapt implements IImportDataCleaningAdapt {
+
+ @Autowired
+ private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
public List analysisExcel(Workbook workbook, JSONObject paramIn, ComponentValidateResult result) throws Exception {
List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
//鑾峰彇妤间俊鎭�
- if (paramIn.containsKey("importMeterDynamic")) {
- getRooms2(workbook, rooms);
- } else {
- getRooms(workbook, rooms);
- }
-
+ getRooms(workbook, rooms);
generatorBatch(paramIn);
for (ImportExportMeterWaterDto importRoomFee : rooms) {
importRoomFee.setBatchId(paramIn.getString("batchId"));
@@ -102,49 +101,5 @@
}
- private void getRooms2(Workbook workbook, List<ImportExportMeterWaterDto> rooms) {
- Sheet sheet = null;
- sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
- List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
- ImportExportMeterWaterDto importRoomFee = null;
- for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- Object[] os = oList.get(osIndex);
- if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
- continue;
- }
- if (StringUtil.isNullOrNone(os[0])) {
- continue;
- }
- Assert.hasValue(os[1], (osIndex + 1) + "鍗曞厓缂栧彿涓嶈兘涓虹┖");
- Assert.hasValue(os[2], (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[6].toString());
- String endTime = excelDoubleToDate(os[8].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 ImportExportMeterWaterDto();
- importRoomFee.setFloorNum(os[0].toString());
- importRoomFee.setUnitNum(os[1].toString());
- importRoomFee.setRoomNum(os[2].toString());
- importRoomFee.setPrice(Double.parseDouble(os[4].toString()));
- importRoomFee.setPreDegrees(os[5].toString());
- importRoomFee.setPreReadingTime(startTime);
- importRoomFee.setCurDegrees(os[7].toString());
- importRoomFee.setCurReadingTime(endTime);
- rooms.add(importRoomFee);
- if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
- throw new IllegalArgumentException((osIndex + 1) + "琛屾湰鏈熻鏁板皬浜庝笂鏈熻鏁�");
- }
- }
- }
}
--
Gitblit v1.8.0