productDev/funingyunwei.git

			@@ -94,7 +94,6 @@
			ywContractRoom.setIsdeleted(Constants.ZERO);
			ywContractRoom.setContractId(ywContractBill.getId());
			ywContractRoom.setType(Constants.ONE);

			}
			ywContractRoomMapper.insert(ywContractBill.getYwContractRoomList());
			}
			@@ -259,20 +258,30 @@
			);
			//楼宇名称
			List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
			// String roomPathName = new StringBuffer();
			// for (:
			// ) {
			//
			// }


			StringBuilder roomPathName = new StringBuilder();
			for (YwContractRoom ywContractRoom:ywContractRoomList) {
			if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
			roomPathName.append(ywContractRoom.getProjectName());
			}
			if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
			roomPathName.append(ywContractRoom.getBuildingName());
			}
			if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
			roomPathName.append(ywContractRoom.getFloorName());
			}
			if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
			roomPathName.append(ywContractRoom.getRoomName());
			}
			if(StringUtils.isNotBlank(roomPathName)){
			roomPathName.append(";");
			}
			}
			ywContractBill.setRoomPathName(roomPathName.toString());

			}

			return PageData.from(iPage);
			}



			public void dealRoomDetail(List<YwContractBill> ywContractBillList){
			//查询账单下的楼宇数据
			@@ -285,6 +294,7 @@
			.selectAs(YwProject::getName,YwRoom::getProjectName)
			.selectAs(YwFloor::getName,YwRoom::getFloorName)
			.selectAs(YwBuilding::getName,YwRoom::getBuildingName)
			.selectAs(YwRoom::getName,YwContractRoom::getRoomName)
			.leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
			.leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
			.leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
			@@ -309,4 +319,9 @@
			QueryWrapper<YwContractBill> wrapper = new QueryWrapper<>(ywContractBill);
			return ywContractBillMapper.selectCount(wrapper);
			}





			}