From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
index 2ea806c..ffd401d 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java
@@ -6,6 +6,8 @@
import com.java110.core.log.LoggerFactory;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.floor.FloorDto;
+import com.java110.dto.importData.OwnerCollectionDto;
+import com.java110.dto.importData.Vtil;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.unit.UnitDto;
@@ -103,6 +105,15 @@
return doSaveOwnerRooms(importOwnerRoomDto, importOwnerRoomDtosed);
+ }
+ @Override
+ public int saveOwnerCollection(@RequestBody OwnerCollectionDto ownerCollectionDto){
+
+ if (ownerCollectionDto == null) {
+ return 0;
+ }
+
+ return ownerV1InnerServiceSMOImpl.saveOwnerCollection(ownerCollectionDto);
}
/**
@@ -303,7 +314,11 @@
ownerPo.setbId("-1");
ownerPo.setOwnerTypeCd(importOwnerRoomDto.getOwnerTypeCd());
ownerPo.setCommunityId(importOwnerRoomDto.getCommunityId());
- ownerPo.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+ if (importOwnerRoomDto.getOwnerId() == null) {
+ ownerPo.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
+ }else{
+ ownerPo.setOwnerId(importOwnerRoomDto.getOwnerId());
+ }
ownerPo.setName(importOwnerRoomDto.getOwnerName());
ownerPo.setIdCard(importOwnerRoomDto.getIdCard());
ownerPo.setAge(importOwnerRoomDto.getAge());
@@ -315,6 +330,11 @@
ownerPo.setPersonType(importOwnerRoomDto.getPersonType());
ownerPo.setPersonRole(importOwnerRoomDto.getPersonRole());
ownerPo.setConcactPerson(importOwnerRoomDto.getConcactPerson());
+
+ ownerPo.setPropertyCertificateNo(importOwnerRoomDto.getPropertyCertificateNo());
+ ownerPo.setIsEvChargerInstalled(importOwnerRoomDto.getIsEvChargerInstalled());
+ ownerPo.setHouseholdPoliceStation(importOwnerRoomDto.getHouseholdPoliceStation());
+
ownerPo.setConcactLink(importOwnerRoomDto.getConcactLink());
flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
if (flag < 1) {
@@ -376,6 +396,7 @@
roomDto.setCommunityId(importOwnerRoomDto.getCommunityId());
roomDto.setRoomNum(importOwnerRoomDto.getRoomNum());
roomDto.setUnitId(unitId);
+ roomDto.setPropertyAddress(importOwnerRoomDto.getPropertyAddress());
List<RoomDto> roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto);
RoomPo roomPo = null;
String roomId = "";
@@ -385,7 +406,11 @@
roomPo = new RoomPo();
//roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
roomPo.setState(importOwnerRoomDto.getRoomState());
- roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
+ if (importOwnerRoomDto.getRoomId() == null) {
+ roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
+ }else{
+ roomPo.setRoomId(importOwnerRoomDto.getRoomId());
+ }
roomPo.setApartment(importOwnerRoomDto.getSection());
roomPo.setSection("1");
roomPo.setCommunityId(importOwnerRoomDto.getCommunityId());
@@ -403,7 +428,14 @@
roomPo.setDoorRoomNum(importOwnerRoomDto.getDoorRoomNum());
roomPo.setPropertyType(importOwnerRoomDto.getPropertyType());
roomPo.setPropertyAddress(importOwnerRoomDto.getPropertyAddress());
+ roomPo.setRemark(importOwnerRoomDto.getRemark());
roomPo.setHouseCertificateNo(importOwnerRoomDto.getHouseCertificateNo());
+ roomPo.setRoadName(importOwnerRoomDto.getRoadName());
+ roomPo.setSellDate(importOwnerRoomDto.getSellDate());
+ roomPo.setBuyDate(importOwnerRoomDto.getBuyDate());
+ roomPo.setSellState(importOwnerRoomDto.getSellState());
+ roomPo.setEoc(importOwnerRoomDto.getEoc());
+ roomPo.setRoomBuyer(importOwnerRoomDto.getRoomBuyer());
flag = roomV1InnerServiceSMOImpl.saveRoom(roomPo);
if (flag < 1) {
@@ -452,6 +484,9 @@
UnitDto unitDto = new UnitDto();
unitDto.setCommunityId(importOwnerRoomDto.getCommunityId());
+ if (Vtil.defaultValue(importOwnerRoomDto.getUnitNum()) == null) {
+ importOwnerRoomDto.setUnitNum("绌�");
+ }
unitDto.setUnitNum(importOwnerRoomDto.getUnitNum());
unitDto.setFloorId(floorId);
List<UnitDto> unitDtos = unitV1InnerServiceSMOImpl.queryUnits(unitDto);
--
Gitblit v1.8.0