|
@@ -77,7 +77,7 @@ public class MoreDataListener extends AnalysisEventListener<MoreExcelInfo> {
|
|
|
// 如果没有添加过,新增泵站,然后再通过小区和楼号查询对应的数据,绑定关系)
|
|
|
for (MoreExcelInfo bzxqlhInfo : list) {
|
|
|
String pumpingStationName = bzxqlhInfo.getPumpingStationName();
|
|
|
- List<TPumpingStation> pumpingStations = this.tPumpingStationMapper.selectTPumpingStationList(TPumpingStation.builder().name(pumpingStationName).build());
|
|
|
+ List<TPumpingStation> pumpingStations = this.tPumpingStationMapper.selectTPumpingStationList(TPumpingStation.builder().fullName(pumpingStationName).build());
|
|
|
Long pumpingStationId = null;
|
|
|
if(CollectionUtils.isEmpty(pumpingStations)){
|
|
|
log.info("A第一次添加泵站信息,泵站名称是{}", pumpingStationName);
|
|
@@ -92,11 +92,11 @@ public class MoreDataListener extends AnalysisEventListener<MoreExcelInfo> {
|
|
|
//有了泵站信息,处理其他逻辑
|
|
|
//再通过小区和楼号查询对应的数据,绑定关系
|
|
|
//2024年12月31日18:28:22 这里不能直接通过楼号去查询,因为楼号很多都是重复的 通过小区查询、,因为小区名字是唯一的。
|
|
|
- List<TNeighborhood> tNeighborhoods = this.tNeighborhoodMapper.selectTNeighborhoodList(TNeighborhood.builder().name(bzxqlhInfo.getNeighbourName()).build());
|
|
|
+ List<TNeighborhood> tNeighborhoods = this.tNeighborhoodMapper.selectTNeighborhoodList(TNeighborhood.builder().fullName(bzxqlhInfo.getNeighbourName()).build());
|
|
|
if(!CollectionUtils.isEmpty(tNeighborhoods)){
|
|
|
TNeighborhood tNeighborhood = tNeighborhoods.get(0);
|
|
|
//通过小区ID和楼号名称【2者组合是唯一的】
|
|
|
- List<TNeighborhoodBuilding> tNeighborhoodBuildings = this.tNeighborhoodBuildingMapper.selectTNeighborhoodBuildingList(TNeighborhoodBuilding.builder().neighborhoodId(tNeighborhood.getId()).name(bzxqlhInfo.getBuildingName()).build());
|
|
|
+ List<TNeighborhoodBuilding> tNeighborhoodBuildings = this.tNeighborhoodBuildingMapper.selectTNeighborhoodBuildingList(TNeighborhoodBuilding.builder().neighborhoodId(tNeighborhood.getId()).fullName(bzxqlhInfo.getBuildingName()).build());
|
|
|
if(!CollectionUtils.isEmpty(tNeighborhoodBuildings)){
|
|
|
TNeighborhoodBuilding tNeighborhoodBuilding = tNeighborhoodBuildings.get(0);
|
|
|
//泵关联小区楼号对象
|