From 03dcc05067d46487eac0c65b9fdeb6436c6e7311 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期四, 11 九月 2025 18:48:19 +0800
Subject: [PATCH] 小区添加接管日期以及对初始化时间进行限制2025/09/11
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
index 2264734..739c657 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -7,6 +7,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.PropertyWhiteListFlowDto;
+import com.java110.dto.community.CommunityDto;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contract.ContractPartyaDto;
import com.java110.dto.fee.*;
@@ -22,6 +23,7 @@
import com.java110.fee.cmd.fee.PayFeePreCmd;
import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.*;
import com.java110.intf.store.IContractInnerServiceSMO;
@@ -117,11 +119,18 @@
@Autowired
private ImportRoomFeeQueueDataAdapt importRoomFeeQueueDataAdapt;
+ @Autowired
+ private ICommunityInnerServiceSMO communityInnerServiceSMO;
+
@Override
public void importData(List<AssetImportLogDetailDto> assetImportLogDetailDtos) {
-
+ String communityId = assetImportLogDetailDtos.get(0).getCommunityId();
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(communityId);
+ List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(communityDto);
for (AssetImportLogDetailDto assetImportLogDetailDto : assetImportLogDetailDtos) {
try {
+ assetImportLogDetailDto.setTakeTime(communityDtos.get(0).getTakeTime());
importDatas(assetImportLogDetailDto);
updateImportLogDetailState(assetImportLogDetailDto.getDetailId());
} catch (Exception e) {
@@ -141,6 +150,9 @@
String communityId = assetImportLogDetailDto.getCommunityId();
JSONObject data = JSONObject.parseObject(assetImportLogDetailDto.getContent());
ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(data, ImportRoomFee.class);
+ if (DateUtil.getDateFromStringB(data.getString("chargeStart").split(" ")[0]).getTime() <= DateUtil.getDateFromStringB(assetImportLogDetailDto.getTakeTime().split(" ")[0]).getTime()){
+ throw new IllegalStateException("璇ヨ垂鐢ㄤ负璧峰鏃堕棿灏忎簬灏忓尯鎺ョ鏃堕棿涓嶈繘琛屽鍏�");
+ }
if (importRoomFee.getEndTime() != null){
String[] split = importRoomFee.getEndTime().split(" ");
importRoomFee.setEndTime(split[0] + " 23:59:59");
@@ -160,6 +172,9 @@
}
}
}
+// if (importRoomFee.getDoorRoomNum() != null && importRoomFee.getDoorRoomNum().split("-").length < 2) {
+// importRoomFee.setObjType("7777");
+// }
if(importRoomFee.getSecondaryFeeTypeCd()!= null && importRoomFee.getSecondaryFeeTypeCd().equals("涓存椂鍋滆溅璐�-鍏朵粬") &&(importRoomFee.getObjType() == null || !(importRoomFee.getObjType().equals("7777")))){
CarInoutPo carInout = new CarInoutPo();
carInout.setCommunityId(communityId);
--
Gitblit v1.8.0