From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportMeterWaterFeeSMOImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 c2399c5..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;
@@ -232,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) + "琛屾湰鏈熻鏁板皬浜庝笂鏈熻鏁�");
+ }
}
}
@@ -280,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