From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportContractQueueDataAdapt.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportContractQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportContractQueueDataAdapt.java
index aef4657..9f8b991 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportContractQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportContractQueueDataAdapt.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.contract.*;
@@ -88,41 +89,36 @@
ContractAmountDetailDto contractAmountDetail = data.getObject("contractAmountDetail", ContractAmountDetailDto.class);
ContractManagementShareDto contractManagementShare = data.getObject("contractManagementShare", ContractManagementShareDto.class);
ContractPaymentStatusDto contractPaymentStatus = data.getObject("contractPaymentStatus", ContractPaymentStatusDto.class);
- List<ContractCollectionDetailDto> contractCollectionDetail = data.getObject("contractCollectionDetail", List.class);
- data.remove("adContractInfo");
+ List<ContractCollectionDetailDto> contractCollectionDetail = data.getObject("contractCollectionDetailDtos", new TypeReference<List<ContractCollectionDetailDto>>() {}); data.remove("adContractInfo");
data.remove("contractAmountDetail");
data.remove("contractManagementShare");
data.remove("contractPaymentStatus");
ContractDto contractDto = BeanConvertUtil.covertBean(data, ContractDto.class);
- ContractPo contractPo = BeanConvertUtil.covertBean(data, ContractPo.class);
+// ContractPo contractPo = BeanConvertUtil.covertBean(data, ContractPo.class);
contractDto.setContractAmountDetail(contractAmountDetail);
contractDto.setContractManagementShare(contractManagementShare);
contractDto.setAdContractInfo(adContractInfo);
contractDto.setContractPaymentStatus(contractPaymentStatus);
contractDto.setContractCollectionDetailDtos(contractCollectionDetail);
- contractDto.setContractCode(contractPo.getContractCode());
- contractDto.setStartTime(Vtil.defaultValueToDate(contractPo.getStartTime(), "start", null));
- contractDto.setEndTime(Vtil.defaultValueToDate(contractPo.getEndTime(), "end", null));
- contractPo.setStartTime(contractDto.getStartTime());
- contractPo.setEndTime(contractDto.getEndTime());
- contractDto.setContractId(null);
- int i = contractInnerServiceSMOImpl.queryContractsCount(contractDto);
-
- if (i > 0) {
- throw new IllegalArgumentException("閲嶅鐨勫悎鍚�");
+ contractDto.setStartTime(Vtil.defaultValueToDate(contractDto.getStartTime(), "start", null));
+ contractDto.setEndTime(Vtil.defaultValueToDate(contractDto.getEndTime(), "end", null));
+// int i = contractInnerServiceSMOImpl.queryContractsCount(contractDto);
+//
+// if (i > 0) {
+// throw new IllegalArgumentException("閲嶅鐨勫悎鍚�");
+// }
+ if (Vtil.defaultValue(contractDto.getCommunityName()) != null) {
+ CommunityDto community = new CommunityDto();
+ community.setName(contractDto.getCommunityName());
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(community);
+ if (communityDtos == null || communityDtos.size() == 0) {
+// throw new IllegalArgumentException("鏈煡璇㈠埌" + community.getName() + "灏忓尯");
+ }
+ else {
+ contractDto.setCommunityId(communityDtos.get(0).getCommunityId());
+ }
}
- contractDto.setContractId(contractPo.getContractId());
- contractPo.setOperator("-");
- contractPo.setOperatorLink("-");
- contractPo.setContractParentId("");
- CommunityDto community = new CommunityDto();
- community.setName(contractDto.getCommunityName());
- List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(community);
- if (communityDtos == null || communityDtos.size() == 0) {
- throw new IllegalArgumentException("鏈煡璇㈠埌" + community.getName() + "灏忓尯");
- }
- contractPo.setCommunityId(communityDtos.get(0).getCommunityId());
- contractInnerServiceSMOImpl.saveContract(contractPo);
+ contractInnerServiceSMOImpl.saveContract(contractDto);
sqlSessionTemplate.insert("adContractInfoDaoImpl.saveAdContractInfo", BeanConvertUtil.beanCovertMap(contractDto.getAdContractInfo()));
sqlSessionTemplate.insert("contractAmountDetailDaoImpl.saveContractAmountDetail", BeanConvertUtil.beanCovertMap(contractDto.getContractAmountDetail()));
sqlSessionTemplate.insert("contractManagementShareDaoImpl.saveContractManagementShare", BeanConvertUtil.beanCovertMap(contractDto.getContractManagementShare()));
--
Gitblit v1.8.0