|
|
@@ -134,6 +134,7 @@
|
|
134
|
134
|
SELECT
|
|
135
|
135
|
i.id,
|
|
136
|
136
|
i.bill_invoice_explain as billInvoiceExplain,
|
|
|
137
|
+ b.is_ticket as isTicket,
|
|
137
|
138
|
i.pay_price AS payPrice,
|
|
138
|
139
|
i.ta_user_id AS taUserId,
|
|
139
|
140
|
i.bill_status AS billStatus,
|
|
|
@@ -156,7 +157,8 @@
|
|
156
|
157
|
</if>
|
|
157
|
158
|
and i.status=1
|
|
158
|
159
|
AND i.room_no_id in (SELECT room_no_id
|
|
159
|
|
- from ta_user_verify WHERE person_id = #{personId} and role_id = 1
|
|
|
160
|
+ from ta_user_verify WHERE person_id = #{personId}
|
|
|
161
|
+<!-- and role_id = 1-->
|
|
160
|
162
|
<if test="taUserVerifyId != null">
|
|
161
|
163
|
AND id = #{taUserVerifyId}
|
|
162
|
164
|
</if>
|
|
|
@@ -167,6 +169,7 @@
|
|
167
|
169
|
SELECT
|
|
168
|
170
|
i.id,
|
|
169
|
171
|
i.bill_invoice_explain AS billInvoiceExplain,
|
|
|
172
|
+ b.is_ticket as isTicket,
|
|
170
|
173
|
i.pay_price AS payPrice,
|
|
171
|
174
|
i.pay_date as payDate,
|
|
172
|
175
|
i.ta_user_id AS taUserId,
|
