Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -30,7 +30,7 @@
			<select id="getFeeReceiptInfo" parameterType="Map" resultType="Map">
			select t.amount,t.obj_id,t.obj_id objId,t.remark,t.status_cd,t.status_cd statusCd,t.obj_name,t.obj_name
			objName,t.community_id,t.community_id communityId,t.receipt_id,t.receipt_id receiptId,t.obj_type,t.obj_type
			objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName
			objType,t.create_time createTime,frd.fee_name feeName,t.pay_obj_id payObjId,t.pay_obj_name payObjName,pf.fee_type_cd feeTypeCd
			from fee_receipt t
			inner join fee_receipt_detail frd on t.receipt_id = frd.receipt_id and frd.status_cd = '0'
			inner join pay_fee pf on frd.fee_id = pf.fee_id and pf.status_cd = '0'
			@@ -71,11 +71,16 @@
			<if test="objType !=null and objType != ''">
			and t.obj_type= #{objType}
			</if>
			<if test="qstartTime !=null and qstartTime != ''">
			and t.create_time >= #{qstartTime}
			</if>
			<if test="qendTime !=null and qendTime != ''">
			and t.create_time <= #{qendTime}
			</if>
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			@@ -136,9 +141,7 @@
			<if test="communityId !=null and communityId != ''">
			and t.community_id= #{communityId}
			</if>

			UNION ALL

			SELECT
			CONCAT( f.floor_num, '栋', bu.unit_num, '单元', b.room_num, '室' ) AS objName,
			oc.car_num AS carNum,
			@@ -240,7 +243,6 @@
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			</if>

			</select>


			@@ -272,7 +274,6 @@
			<if test="receiptId !=null and receiptId != ''">
			and t.receipt_id= #{receiptId}
			</if>

			</update>

			<!-- 查询收据数量 add by wuxw 2018-07-03 -->
			@@ -318,8 +319,11 @@
			<if test="objType !=null and objType != ''">
			and t.obj_type= #{objType}
			</if>


			<if test="qstartTime !=null and qstartTime != ''">
			and t.create_time >= #{qstartTime}
			</if>
			<if test="qendTime !=null and qendTime != ''">
			and t.create_time <= #{qendTime}
			</if>
			</select>

			</mapper>