提交

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -331,13 +331,16 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 billInvoice.setCommunityId(userElement.getCommunityId());
                 billInvoice.setBillId(bill.getId());
 
+                /**
+                 * 需要知道这个房产的业主
+                 */
                 // 楼栋资料库
                 QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("phase", e.getPhase());
-                queryWrapper.eq("building", e.getBuilding());
-                queryWrapper.eq("unit", e.getUnit());
-                queryWrapper.eq("level", e.getLevel());
-                queryWrapper.eq("room_no", e.getRoomNo());
+                queryWrapper.eq("phase_id", e.getPhase());
+                queryWrapper.eq("building_id", e.getBuilding());
+                queryWrapper.eq("unit_id", e.getUnit());
+                queryWrapper.eq("level_id", e.getLevel());
+                queryWrapper.eq("room_no_id", e.getRoomNo());
                 queryWrapper.eq("community_id", userElement.getCommunityId());
                 TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(queryWrapper);
                 if (null == buildingOwnerInfo) {
@@ -629,6 +632,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         // 分页查询
         QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
         buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
+        buildingOwnerInfoQueryWrapper.groupBy("phase_id", "building_id", "unit_id", "level_id", "room_no_id");
         IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
         List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
         // 总页数
@@ -655,7 +659,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 cell = row.createCell(4);
                 cell.setCellValue(buildingOwnerInfo.getRoomNoName());
                 cell = row.createCell(5);
-                cell.setCellValue(buildingOwnerInfo.getOwnerName());
+                cell.setCellValue(buildingOwnerInfo.getOwnerName() + "");
                 currentRow ++;
                 index ++;
                 if (index == records.size()) {