From d0b19298e28a9b8b50c778704b77160f17e73950 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期五, 17 四月 2026 18:20:38 +0800
Subject: [PATCH] 水电话费
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java | 56 +++---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java | 2
java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml | 8 +
java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java | 361 --------------------------------------------
springboot/src/main/resources/application.yml | 2
5 files changed, 44 insertions(+), 385 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java b/java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java
index cc95881..7cee65a 100644
--- a/java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/PropertyWhiteListFlowDto.java
@@ -1,11 +1,14 @@
package com.java110.dto;
+import lombok.Data;
+
import java.math.BigDecimal;
import java.util.Date;
/**
* 鐗╀笟鐧藉崟娴佹按DTO绫伙紝鐢ㄤ簬ORM鎿嶄綔
*/
+@Data
public class PropertyWhiteListFlowDto {
private String id; // 鑷涓婚敭锛屽敮涓�鏍囪瘑涓�鏉＄櫧鍗曟祦姘�
private String chargeTime; // 鏀惰垂鏃ユ湡锛屾牸寮廦YYY-MM-DD锛堝繀杈擄級
@@ -34,7 +37,8 @@
private String communityId;
private String frequency;
private String frequencyLike;
-
+ private String startBankDepositDate;
+ private String endBankDepositDate;
private String feeYear;
private Integer row;
@@ -64,359 +68,4 @@
*/
private String shi;
- public String getNong() {
- return nong;
- }
-
- public void setNong(String nong) {
- this.nong = nong;
- }
-
- public String getMen() {
- return men;
- }
-
- public void setMen(String men) {
- this.men = men;
- }
-
- public String getShi() {
- return shi;
- }
-
- public void setShi(String shi) {
- this.shi = shi;
- }
-
- public String getFloorNum() {
- return floorNum;
- }
-
- public void setFloorNum(String floorNum) {
- this.floorNum = floorNum;
- }
-
- public String getUnitNum() {
- return unitNum;
- }
-
- public void setUnitNum(String unitNum) {
- this.unitNum = unitNum;
- }
-
- public String getRoomNum() {
- return roomNum;
- }
-
- public void setRoomNum(String roomNum) {
- this.roomNum = roomNum;
- }
-
- public String getObjType() {
- return objType;
- }
-
- public void setObjType(String objType) {
- this.objType = objType;
- }
-
- public Integer getPage() {
- return page;
- }
-
- public void setPage(Integer page) {
- this.page = page;
- }
-
- public Integer getRow() {
- return row;
- }
-
- public void setRow(Integer row) {
- this.row = row;
- }
-
- public String getFeeYear() {
- return feeYear;
- }
-
- public void setFeeYear(String feeYear) {
- this.feeYear = feeYear;
- }
-
- // 鏃犲弬鏋勯�犲嚱鏁�
- public PropertyWhiteListFlowDto() {
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getFrequencyLike() {
- return frequencyLike;
- }
-
- public void setFrequencyLike(String frequencyLike) {
- this.frequencyLike = frequencyLike;
- }
-
- public String getChargeTime() {
- return chargeTime;
- }
-
- public void setChargeTime(String chargeTime) {
- this.chargeTime = chargeTime;
- }
-
- public String getInvoiceReceiptNo() {
- return invoiceReceiptNo;
- }
-
- public void setInvoiceReceiptNo(String invoiceReceiptNo) {
- this.invoiceReceiptNo = invoiceReceiptNo;
- }
-
- public String getRoomId() {
- return roomId;
- }
-
- public void setRoomId(String roomId) {
- this.roomId = roomId;
- }
-
- public String getPropertyAddress() {
- return propertyAddress;
- }
-
- public void setPropertyAddress(String propertyAddress) {
- this.propertyAddress = propertyAddress;
- }
-
- public String getDoorRoomNum() {
- return doorRoomNum;
- }
-
- public void setDoorRoomNum(String doorRoomNum) {
- this.doorRoomNum = doorRoomNum;
- }
-
- public String getSecondaryFeeTypeCd() {
- return secondaryFeeTypeCd;
- }
-
- public void setSecondaryFeeTypeCd(String secondaryFeeTypeCd) {
- this.secondaryFeeTypeCd = secondaryFeeTypeCd;
- }
-
- public String getChargeAmount() {
- return chargeAmount;
- }
-
- public void setChargeAmount(String chargeAmount) {
- this.chargeAmount = chargeAmount;
- }
-
- public String getCharger() {
- return charger;
- }
-
- public void setCharger(String charger) {
- this.charger = charger;
- }
-
- public String getBankDepositDate() {
- return bankDepositDate;
- }
-
- public void setBankDepositDate(String bankDepositDate) {
- this.bankDepositDate = bankDepositDate;
- }
-
- public String getBankDepositor() {
- return bankDepositor;
- }
-
- public void setBankDepositor(String bankDepositor) {
- this.bankDepositor = bankDepositor;
- }
-
- public String getSplitBankDepositAmount() {
- return splitBankDepositAmount;
- }
-
- public void setSplitBankDepositAmount(String splitBankDepositAmount) {
- this.splitBankDepositAmount = splitBankDepositAmount;
- }
-
- public String getBankDepositAmount() {
- return bankDepositAmount;
- }
-
- public void setBankDepositAmount(String bankDepositAmount) {
- this.bankDepositAmount = bankDepositAmount;
- }
-
- public String getCheckAmount() {
- return checkAmount;
- }
-
- public void setCheckAmount(String checkAmount) {
- this.checkAmount = checkAmount;
- }
-
- public String getWhiteListArchiveNo() {
- return whiteListArchiveNo;
- }
-
- public void setWhiteListArchiveNo(String whiteListArchiveNo) {
- this.whiteListArchiveNo = whiteListArchiveNo;
- }
-
- public String getSheetCount() {
- return sheetCount;
- }
-
- public void setSheetCount(String sheetCount) {
- this.sheetCount = sheetCount;
- }
-
- public String getFinancialReceiver() {
- return financialReceiver;
- }
-
- public void setFinancialReceiver(String financialReceiver) {
- this.financialReceiver = financialReceiver;
- }
-
- public String getInputTime() {
- return inputTime;
- }
-
- public void setInputTime(String inputTime) {
- this.inputTime = inputTime;
- }
-
- public String getInputPerson() {
- return inputPerson;
- }
-
- public void setInputPerson(String inputPerson) {
- this.inputPerson = inputPerson;
- }
-
- public String getOrderNo() {
- return orderNo;
- }
-
- public void setOrderNo(String orderNo) {
- this.orderNo = orderNo;
- }
-
- public String getLicensePlate() {
- return licensePlate;
- }
-
- public void setLicensePlate(String licensePlate) {
- this.licensePlate = licensePlate;
- }
-
- public String getCategory22() {
- return category22;
- }
-
- public void setCategory22(String category22) {
- this.category22 = category22;
- }
-
- public String getChargeStart() {
- return chargeStart;
- }
-
- public void setChargeStart(String chargeStart) {
- this.chargeStart = chargeStart;
- }
-
- public String getChargeEnd() {
- return chargeEnd;
- }
-
- public void setChargeEnd(String chargeEnd) {
- this.chargeEnd = chargeEnd;
- }
-
- public String getCommunityId() {
- return communityId;
- }
-
- public void setCommunityId(String communityId) {
- this.communityId = communityId;
- }
-
- public String getBatchId() {
- return batchId;
- }
-
- public void setBatchId(String batchId) {
- this.batchId = batchId;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getStoreId() {
- return storeId;
- }
-
- public void setStoreId(String storeId) {
- this.storeId = storeId;
- }
-
- public String getFrequency() {
- return frequency;
- }
-
- public void setFrequency(String frequency) {
- this.frequency = frequency;
- }
-
- public String getReceiptYearMonth() {
- return receiptYearMonth;
- }
-
- public void setReceiptYearMonth(String receiptYearMonth) {
- this.receiptYearMonth = receiptYearMonth;
- }
-
- public String getReceiptYear() {
- return receiptYear;
- }
-
- public void setReceiptYear(String receiptYear) {
- this.receiptYear = receiptYear;
- }
-
- public String getPendingProblem() {
- return pendingProblem;
- }
-
- public void setPendingProblem(String pendingProblem) {
- this.pendingProblem = pendingProblem;
- }
-
- public String getRoomNumber() {
- return roomNumber;
- }
-
- public void setRoomNumber(String roomNumber) {
- this.roomNumber = roomNumber;
- }
}
diff --git a/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
index 50f491e..74afc50 100644
--- a/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
@@ -117,6 +117,14 @@
FROM
property_white_list_flow
<where>
+ <!-- 鏂板锛氶摱琛屽埌璐︽棩鏈熷紑濮嬫椂闂� -->
+ <if test="startBankDepositDate != null">
+ AND bank_deposit_date >= #{startBankDepositDate}
+ </if>
+ <!-- 鏂板锛氶摱琛屽埌璐︽棩鏈熺粨鏉熸椂闂� -->
+ <if test="endBankDepositDate != null">
+ AND bank_deposit_date <= #{endBankDepositDate}
+ </if>
<if test="startChargeTime != null">
AND charge_time >= #{startChargeTime}
</if>
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
index f52dc33..ee51c77 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
@@ -84,7 +84,7 @@
break;
}
Object[] os = new Object[170];
- System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
+ System.arraycopy(oList.get(osIndex), 0, os, 0, Math.min(oList.get(osIndex).length, 170));
// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
index d19e21b..cceda2d 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomOwnerV2QueueDataAdapt.java
@@ -562,33 +562,35 @@
ownerV1InnerServiceSMOImpl.saveOwner(ownerPoTo3);
}
}
- for (int i = 0 ; i < feeDtos.size(); i++) {
- FeeConfigDto feeDto = feeDtos.get(i);
- PayFeePo payFeePo = new PayFeePo();
- payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
- payFeePo.setbId("-1");
- payFeePo.setFeeTypeCd(feeDto.getFeeTypeCd());
- payFeePo.setSecondaryFeeTypeCd(feeDto.getSecondaryFeeTypeCd());
- payFeePo.setCommunityId(importOwnerRoomDto.getCommunityId());
- payFeePo.setPayerObjId(importOwnerRoomDto.getRoomId());
- payFeePo.setIncomeObjId("102025062610470035");
- payFeePo.setStartTime(feeDto.getStartTime());
- payFeePo.setEndTime(feeDto.getStartTime());
- payFeePo.setUserId(importOwnerRoomDto.getUserId());
- payFeePo.setStatusCd("0");
- payFeePo.setFeeFlag(feeDto.getFeeFlag());
- payFeePo.setConfigId(feeDto.getConfigId());
- payFeePo.setState("2008001");
- payFeePo.setPayerObjType("3333");
- payFeePo.setBatchId(assetImportLogDetailDto.getLogId());
- payFeeV1InnerServiceSMO.savePayFee(payFeePo);
- List<FeeAttrPo> feeAttrPos = new ArrayList<>();
- feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390007" , importOwnerRoomDto.getOwnerId()));
- feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390010" , feeDto.getEndTime().split(" ")[0] + " 23:59:59"));
- feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390009" , importOwnerRoomDto.getTel()));
- feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390008" , importOwnerRoomDto.getOwnerName()));
- feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390012" , importOwnerRoomDto.getDoorRoomNum()));
- int i1 = feeAttrInnerServiceSMO.saveFeeAttrs(feeAttrPos);
+ if (feeDtos != null) {
+ for (int i = 0 ; i < feeDtos.size(); i++) {
+ FeeConfigDto feeDto = feeDtos.get(i);
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setbId("-1");
+ payFeePo.setFeeTypeCd(feeDto.getFeeTypeCd());
+ payFeePo.setSecondaryFeeTypeCd(feeDto.getSecondaryFeeTypeCd());
+ payFeePo.setCommunityId(importOwnerRoomDto.getCommunityId());
+ payFeePo.setPayerObjId(importOwnerRoomDto.getRoomId());
+ payFeePo.setIncomeObjId("102025062610470035");
+ payFeePo.setStartTime(feeDto.getStartTime());
+ payFeePo.setEndTime(feeDto.getStartTime());
+ payFeePo.setUserId(importOwnerRoomDto.getUserId());
+ payFeePo.setStatusCd("0");
+ payFeePo.setFeeFlag(feeDto.getFeeFlag());
+ payFeePo.setConfigId(feeDto.getConfigId());
+ payFeePo.setState("2008001");
+ payFeePo.setPayerObjType("3333");
+ payFeePo.setBatchId(assetImportLogDetailDto.getLogId());
+ payFeeV1InnerServiceSMO.savePayFee(payFeePo);
+ List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+ feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390007" , importOwnerRoomDto.getOwnerId()));
+ feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390010" , feeDto.getEndTime().split(" ")[0] + " 23:59:59"));
+ feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390009" , importOwnerRoomDto.getTel()));
+ feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390008" , importOwnerRoomDto.getOwnerName()));
+ feeAttrPos.add(new FeeAttrPo(payFeePo.getFeeId(), payFeePo.getCommunityId(), GenerateCodeFactory.getGeneratorId("11"), "390012" , importOwnerRoomDto.getDoorRoomNum()));
+ int i1 = feeAttrInnerServiceSMO.saveFeeAttrs(feeAttrPos);
+ }
}
}
}
diff --git a/springboot/src/main/resources/application.yml b/springboot/src/main/resources/application.yml
index e54f7d3..5dffd44 100644
--- a/springboot/src/main/resources/application.yml
+++ b/springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: devlocal
+ active: debug
import:
--
Gitblit v1.8.0