|
@@ -123,15 +123,16 @@ public class ExcelController extends BaseController {
|
|
|
for (BZXQLHInfo bzxqlhInfo : excelFormBZXQLH) {
|
|
|
String pumpingStationName = bzxqlhInfo.getPumpingStationName();
|
|
|
List<TPumpingStation> pumpingStations = this.tPumpingStationMapper.selectTPumpingStationList(TPumpingStation.builder().name(pumpingStationName).build());
|
|
|
- TPumpingStation tPumpingStation = TPumpingStation.builder().build();
|
|
|
+ Long pumpingStationId = null;
|
|
|
if(CollectionUtils.isEmpty(pumpingStations)){
|
|
|
log.info("A第一次添加泵站信息,泵站名称是{}", pumpingStationName);
|
|
|
//新增泵站,然后再通过小区和楼号查询对应的数据,绑定关系
|
|
|
- tPumpingStation.setName(pumpingStationName);
|
|
|
+ TPumpingStation tPumpingStation = TPumpingStation.builder().name(pumpingStationName).build();
|
|
|
this.tPumpingStationMapper.insertTPumpingStation(tPumpingStation);
|
|
|
+ pumpingStationId = tPumpingStation.getId();
|
|
|
}else{
|
|
|
log.info("Z已经添加过泵站信息,泵站名称是{}", pumpingStationName);
|
|
|
- tPumpingStation = pumpingStations.get(0);
|
|
|
+ pumpingStationId = pumpingStations.get(0).getId();
|
|
|
}
|
|
|
//有了泵站信息,处理其他逻辑
|
|
|
//再通过小区和楼号查询对应的数据,绑定关系
|
|
@@ -139,7 +140,7 @@ public class ExcelController extends BaseController {
|
|
|
if(!CollectionUtils.isEmpty(tNeighborhoodBuildings)){
|
|
|
TNeighborhoodBuilding tNeighborhoodBuilding = tNeighborhoodBuildings.get(0);
|
|
|
//泵关联小区楼号对象
|
|
|
- TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber = TPumpingStationNeighbourhoodNumber.builder().pumpingStationId(tPumpingStation.getId()).neighborhoodId(tNeighborhoodBuilding.getNeighborhoodId()).neighborhoodBuildingId(tNeighborhoodBuilding.getId()).build();
|
|
|
+ TPumpingStationNeighbourhoodNumber tPumpingStationNeighbourhoodNumber = TPumpingStationNeighbourhoodNumber.builder().pumpingStationId(pumpingStationId).neighborhoodId(tNeighborhoodBuilding.getNeighborhoodId()).neighborhoodBuildingId(tNeighborhoodBuilding.getId()).build();
|
|
|
this.tPumpingStationNeighbourhoodNumberMapper.insertTPumpingStationNeighbourhoodNumber(tPumpingStationNeighbourhoodNumber);
|
|
|
}
|
|
|
}
|