From b8bf2507bc7b23c90bc6dc71ea2460e277d3800a Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 30 一月 2026 19:23:44 +0800
Subject: [PATCH] 导入测试
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java
index 7fd310d..371f46d 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java
@@ -29,6 +29,7 @@
import com.java110.po.meter.MeterWaterPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -179,7 +180,7 @@
feeConfigDto.setCommunityId(importCustomCreateFeeDto.getCommunityId());
feeConfigDto.setConfigId(importCustomCreateFeeDto.getConfigId());
List<FeeConfigDto> feeConfigDtos = payFeeConfigV1InnerServiceSMOImpl.queryPayFeeConfigs(feeConfigDto);
- if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ if (ListUtil.isNull(feeConfigDtos)) {
throw new IllegalArgumentException("璐圭敤椤逛笉瀛樺湪");
}
payFeePo = new PayFeePo();
@@ -204,8 +205,7 @@
payFeePo.setBatchId(batchId);
payFeePo.setEndTime(importCustomCreateFeeDto.getStartTime());
payFeePo.setStartTime(importCustomCreateFeeDto.getCreateTime());
- if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())
- && !StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())) {
+ if (!StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())) {
payFeePo.setMaxTime(importCustomCreateFeeDto.getEndTime());
} else {
payFeePo.setMaxTime(feeConfigDtos.get(0).getEndTime());
@@ -229,9 +229,8 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
- //todo 涓嶆槸鍛ㄦ湡鎬ц垂鐢ㄧ殑鍦烘櫙闇�瑕佸啓鍏ョ粨鏉熸椂闂�
- if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())
- && !StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())) {
+ //todo 闇�瑕佸啓鍏ョ粨鏉熸椂闂�
+ if (!StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())) {
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importCustomCreateFeeDto.getCommunityId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
--
Gitblit v1.8.0