java/xizang.git

			@@ -6,6 +6,7 @@
			<resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBill">
			<id column="id" property="id" />
			<result column="contract_id" property="contractId" />
			<result column="contract_number" property="contractNumber" />
			<result column="payable_fees_money" property="payableFeesMoney" />
			<result column="payable_fees_time" property="payableFeesTime" />
			<result column="pay_fees_status" property="payFeesStatus" />
			@@ -18,7 +19,7 @@
			<result column="start_time" property="startTime" />
			<result column="end_time" property="endTime" />
			<result column="bank_serial_number" property="bankSerialNumber" />
			<result column="actual_money" property="actualMoney" />
			<result column="outstanding_money" property="outstandingMoney" />
			<result column="voucher" property="voucher" />
			<result column="create_time" property="createTime" />
			<result column="update_time" property="updateTime" />
			@@ -29,7 +30,32 @@

			<!-- 通用查询结果列 -->
			<sql id="Base_Column_List">
			id, contract_id, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, actual_money, voucher, create_time, update_time, create_by, update_by, disabled
			id, contract_id,contract_number, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, outstanding_money, voucher, create_time, update_time, create_by, update_by, disabled
			</sql>

			<select id="page" resultType="com.ruoyi.system.dto.TBillDto">
			SELECT
			b.*,
			t.resident_name as residentName,
			t.phone,
			t.account
			FROM
			t_bill b
			LEFT JOIN t_contract c ON c.contract_number = b.contract_number
			LEFT JOIN t_tenant t ON t.id = c.tenant_id
			<where>
			<if test="query.payFeesStatus != null">
			and b.pay_fees_status = #{query.payFeesStatus}
			</if>
			<if test="query.phone != null and query.phone !=''">
			and t.phone = #{query.phone}
			</if>
			<if test="query.residentName != null and query.residentName !=''">
			and t.resident_name like concat('%',#{query.residentName},'%')
			</if>
			<if test="query.contractNumber != null and query.contractNumber !=''">
			and b.contract_number = #{contractNumber}
			</if>
			</where>
			</select>
			</mapper>