Lianxun_Java.git

			@@ -23,7 +23,7 @@
			select t.apartment,t.built_up_area builtUpArea,t.community_id communityId,t.create_time createTime,
			t.fee_coefficient feeCoefficient,t.layer,t.room_id roomId,t.room_num roomNum,t.section,
			t.state,bu.unit_id unitId,bu.unit_num unitNum,ff.floor_id floorId,ff.floor_num floorNum,
			bo.age,bo.id_card idCard,bo.link,bo.member_id memberId,bo.`name`,bo.owner_id ownerId,t.room_type roomType
			bo.age,bo.id_card idCard,bo.link,bo.member_id memberId,bo.`name`,bo.`name` ownerName,bo.owner_id ownerId,t.room_type roomType
			from building_room t
			INNER JOIN building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
			inner join f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'

			@@ -213,7 +213,7 @@
			reportFeeYearCollectionPo.setFeeName(StringUtil.isEmpty(tmpReportFeeDto.getImportFeeName()) ? tmpReportFeeDto.getFeeName() : tmpReportFeeDto.getImportFeeName());
			reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getCarNum() + "(" + tmpReportCarDto.getAreaNum() + "停车场" + tmpReportCarDto.getNum() + "车位)");
			reportFeeYearCollectionPo.setOwnerId(tmpReportCarDto.getOwnerId());
			reportFeeYearCollectionPo.setObjName(tmpReportCarDto.getOwnerName());
			reportFeeYearCollectionPo.setOwnerName(tmpReportCarDto.getOwnerName());
			reportFeeYearCollectionPo.setOwnerLink(tmpReportCarDto.getLink());

			//reportFeeYearCollectionPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
			@@ -302,7 +302,7 @@
			reportFeeYearCollectionPo.setObjName(reportRoomDto.getFloorNum() + "栋" + reportRoomDto.getRoomNum() + "室");
			}
			reportFeeYearCollectionPo.setOwnerId(reportRoomDto.getOwnerId());
			reportFeeYearCollectionPo.setObjName(reportRoomDto.getOwnerName());
			reportFeeYearCollectionPo.setOwnerName(reportRoomDto.getOwnerName());
			reportFeeYearCollectionPo.setOwnerLink(reportRoomDto.getLink());

			//reportFeeYearCollectionPo.setUpdateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));

	java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史