From a53f35fdf9f31c2f4d03b433803067abef514569 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 20 六月 2023 22:47:08 +0800
Subject: [PATCH] 删除pagehelper
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
index 71fa6d7..291ee0d 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java
@@ -3,18 +3,16 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.meterWater.ImportExportMeterWaterDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.meter.ImportExportMeterWaterDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.api.smo.assetImport.IImportMeterWaterFeeSMO;
import com.java110.intf.fee.IPayFeeBatchV1InnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
-import com.java110.utils.constant.ServiceConstant;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
@@ -23,7 +21,7 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -140,6 +138,7 @@
data.put("userId", result.getUserId());
data.put("configId", reqJson.getString("configId"));
data.put("feeTypeCd", reqJson.getString("feeTypeCd"));
+ data.put("meterType", reqJson.getString("meterType"));
List<ImportExportMeterWaterDto> tmpImportRoomFees = new ArrayList<>();
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
@@ -217,8 +216,8 @@
String startTime = excelDoubleToDate(os[4].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 鏂囨湰鏍煎紡");
+ 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();
@@ -231,6 +230,9 @@
importRoomFee.setCurReadingTime(endTime);
importRoomFee.setPrice(-1);
rooms.add(importRoomFee);
+ if (Double.parseDouble(importRoomFee.getCurDegrees()) < Double.parseDouble(importRoomFee.getPreDegrees())) {
+ throw new IllegalArgumentException((osIndex + 1) + "琛屾湰鏈熻鏁板皬浜庝笂鏈熻鏁�");
+ }
}
}
@@ -279,6 +281,9 @@
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