From 09095d67f2e2acf45dcd55155da491e44206db4e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 05 四月 2024 15:38:14 +0800
Subject: [PATCH] 修改时间 将时间修改 未23:59:59秒
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportCustomFeeQueueDataAdapt.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 e41448a..7fd310d 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
@@ -84,8 +84,13 @@
JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
ImportCustomCreateFeeDto importExportMeterWaterDto = BeanConvertUtil.covertBean(data, ImportCustomCreateFeeDto.class);
+ //todo 澶勭悊缁撴潫鏃堕棿
+ if (!importExportMeterWaterDto.getEndTime().contains(":")) {
+ importExportMeterWaterDto.setEndTime(importExportMeterWaterDto.getEndTime() + " 23:59:59");
+ }
+
String communityId = importExportMeterWaterDto.getCommunityId();
- String batchId = importExportMeterWaterDto.getCommunityId();
+ String batchId = importExportMeterWaterDto.getBatchId();
doImportRoomCreateFee(importExportMeterWaterDto, batchId);
doImportCarCreateFee(importExportMeterWaterDto, batchId);
@@ -199,6 +204,12 @@
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())) {
+ payFeePo.setMaxTime(importCustomCreateFeeDto.getEndTime());
+ } else {
+ payFeePo.setMaxTime(feeConfigDtos.get(0).getEndTime());
+ }
payFeePos.add(payFeePo);
@@ -219,8 +230,8 @@
feeAttrPos.add(feeAttrPo);
//todo 涓嶆槸鍛ㄦ湡鎬ц垂鐢ㄧ殑鍦烘櫙闇�瑕佸啓鍏ョ粨鏉熸椂闂�
- if(!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())
- && !StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())){
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())
+ && !StringUtil.isEmpty(importCustomCreateFeeDto.getEndTime())) {
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importCustomCreateFeeDto.getCommunityId());
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId, true));
@@ -271,5 +282,6 @@
PayFeeDetailRefreshFeeMonthDto payFeeDetailRefreshFeeMonthDto = new PayFeeDetailRefreshFeeMonthDto();
payFeeDetailRefreshFeeMonthDto.setCommunityId(importCustomCreateFeeDto.getCommunityId());
payFeeDetailRefreshFeeMonthDto.setFeeId(payFeePos.get(0).getFeeId());
- payFeeMonthInnerServiceSMOImpl.doGeneratorOrRefreshFeeMonth(payFeeDetailRefreshFeeMonthDto); }
+ payFeeMonthInnerServiceSMOImpl.doGeneratorOrRefreshFeeMonth(payFeeDetailRefreshFeeMonthDto);
+ }
}
--
Gitblit v1.8.0