Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -20,8 +20,9 @@
			builtUpArea,t.owner_name,t.owner_name ownerName,t.config_id,t.config_id configId,t.obj_id,t.obj_id
			objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
			collectionId,t.obj_type,t.obj_type objType,rd.collection_year collectionYear,rd.receivable_amount receivableAmount,
			rd.relation_year relationYear
			rd.relation_year relationYear,rd.received_amount receivedAmount
			from report_fee_year_collection t
			inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
			left join report_fee_year_collection_detail rd on t.collection_id = rd.collection_id and rd.status_cd = '0' and rd.community_id = t.community_id
			where 1 =1
			<if test="ownerLink !=null and ownerLink != ''">
			@@ -63,7 +64,7 @@
			<if test="objType !=null and objType != ''">
			and t.obj_type= #{objType}
			</if>
			order by rd.collectionYear
			order by rd.relation_year

			</select>

			@@ -75,6 +76,7 @@
			objId,t.fee_name,t.fee_name feeName,t.community_id,t.community_id communityId,t.collection_id,t.collection_id
			collectionId,t.obj_type,t.obj_type objType
			from report_fee_year_collection t
			inner join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
			where 1 =1
			<if test="ownerLink !=null and ownerLink != ''">
			and t.owner_link= #{ownerLink}