productDev/funingyunwei.git

			@@ -57,6 +57,9 @@
			@ApiModelProperty(value = "状态 0待执行 1执行中 2已到期 3已退租", example = "1")
			@ExcelColumn(name="状态 0待执行 1执行中 2已到期 3已退租")
			private Integer status;
			@ApiModelProperty(value = "账单结清状态： 0待付款 1部分收款 2已结清 3已关闭", example = "1")
			@ExcelColumn(name="账单结清状态： 0待付款 1部分收款 2已结清 3已关闭")
			private Integer billStatus;

			@ApiModelProperty(value = "类型 0物业租赁 1物业 2租赁", example = "1")
			@ExcelColumn(name="类型 0物业租赁 1物业 2租赁")

			@@ -94,8 +94,8 @@
			@ExcelColumn(name="计租面积（平方米）")
			private BigDecimal rentArea;

			@ApiModelProperty(value = "楼层数", example = "1")
			@ExcelColumn(name="楼层数")
			@ApiModelProperty(value = "楼层编码（关联yw_floor)", example = "1")
			@ExcelColumn(name="楼层编码")
			private Integer floor;

			@ApiModelProperty(value = "所属项目编码（关联yw_project)", example = "1")
			@@ -112,4 +112,7 @@
			@ApiModelProperty(value = "楼宇名称")
			@TableField(exist = false)
			private String buildingName;
			@ApiModelProperty(value = "楼层名称")
			@TableField(exist = false)
			private String floorName;
			}

			@@ -10,6 +10,7 @@
			import com.doumee.dao.business.YwBuildingMapper;
			import com.doumee.dao.business.YwRoomMapper;
			import com.doumee.dao.business.model.YwBuilding;
			import com.doumee.dao.business.model.YwFloor;
			import com.doumee.dao.business.model.YwProject;
			import com.doumee.dao.business.model.YwRoom;
			import com.doumee.service.business.YwRoomService;
			@@ -133,9 +134,11 @@
			MPJLambdaWrapper<YwRoom> queryWrapper = new MPJLambdaWrapper<>();
			queryWrapper.selectAll(YwBuilding.class )
			.selectAs(YwProject::getName,YwRoom::getProjectName)
			.selectAs(YwFloor::getName,YwRoom::getFloorName)
			.selectAs(YwBuilding::getName,YwRoom::getBuildingName)
			.leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)
			.leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId);
			.leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
			.leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor);
			pageWrap.getModel().setIsdeleted(Constants.ZERO);
			Utils.MP.blankToNull(pageWrap.getModel());
			if (pageWrap.getModel().getId() != null) {

	server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史