|
|
|
|
686
|
cell = row.getCell(3);
|
686
|
cell = row.getCell(3);
|
687
|
cell.setCellType(Cell.CELL_TYPE_STRING);
|
687
|
cell.setCellType(Cell.CELL_TYPE_STRING);
|
688
|
String ownerTel = cell.getStringCellValue().trim();
|
688
|
String ownerTel = cell.getStringCellValue().trim();
|
689
|
- cell = row.getCell(4);
|
|
|
690
|
- cell.setCellType(Cell.CELL_TYPE_STRING);
|
|
|
691
|
- String ownerRole = cell.getStringCellValue().trim();
|
|
|
|
|
689
|
+// cell = row.getCell(4);
|
|
|
690
|
+// cell.setCellType(Cell.CELL_TYPE_STRING);
|
|
|
691
|
+// String ownerRole = cell.getStringCellValue().trim();
|
692
|
int currentRow = j+1;
|
692
|
int currentRow = j+1;
|
693
|
if (StringUtils.isEmpty(buildingInfo)){
|
693
|
if (StringUtils.isEmpty(buildingInfo)){
|
694
|
responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
|
694
|
responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
|
|
|
|
|
713
|
return responseBean;
|
713
|
return responseBean;
|
714
|
}
|
714
|
}
|
715
|
|
715
|
|
716
|
- if (StringUtils.isEmpty(ownerRole)){
|
|
|
717
|
- responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
|
|
|
718
|
- return responseBean;
|
|
|
719
|
- }
|
|
|
|
|
716
|
+// if (StringUtils.isEmpty(ownerRole)){
|
|
|
717
|
+// responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
|
|
|
718
|
+// return responseBean;
|
|
|
719
|
+// }
|
720
|
LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
|
720
|
LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
|
721
|
ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
|
721
|
ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
|
722
|
ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
|
722
|
ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
|
|
|
|
|
737
|
//构建数据
|
737
|
//构建数据
|
738
|
TpBuildingOwnerInfo checkOwnerInfo = new TpBuildingOwnerInfo();
|
738
|
TpBuildingOwnerInfo checkOwnerInfo = new TpBuildingOwnerInfo();
|
739
|
checkOwnerInfo.setId(null);
|
739
|
checkOwnerInfo.setId(null);
|
740
|
- checkOwnerInfo.setRoleName(ownerRole);
|
|
|
|
|
740
|
+// checkOwnerInfo.setRoleName(ownerRole);
|
741
|
checkOwnerInfo.setOwnerName(ownerName);
|
741
|
checkOwnerInfo.setOwnerName(ownerName);
|
742
|
checkOwnerInfo.setOwnerTel(ownerTel);
|
742
|
checkOwnerInfo.setOwnerTel(ownerTel);
|
743
|
checkOwnerInfo.setPhaseId(tpRoomNo.getPhaseId());
|
743
|
checkOwnerInfo.setPhaseId(tpRoomNo.getPhaseId());
|