|
@@ -46,6 +46,7 @@
|
|
SELECT t1.id, t1.flow_no, t1.form_date, t1.subsidiary_id, t1.subsidiary, t1.subsidiary_name,
|
|
SELECT t1.id, t1.flow_no, t1.form_date, t1.subsidiary_id, t1.subsidiary, t1.subsidiary_name,
|
|
t1.contract_id,
|
|
t1.contract_id,
|
|
t1.verify_date,
|
|
t1.verify_date,
|
|
|
|
+ t1.bank_no,
|
|
t1.verify_comment,
|
|
t1.verify_comment,
|
|
t1.subsidiary_bank_account
|
|
t1.subsidiary_bank_account
|
|
, t1.subsidiary_bank_name, t1.company_id, case when b.id is null then t1.company_name else b.name end as
|
|
, t1.subsidiary_bank_name, t1.company_id, case when b.id is null then t1.company_name else b.name end as
|
|
@@ -90,6 +91,13 @@
|
|
DATE_FORMAT(t1.form_date,'%Y-%m-%d') <= #{endDate}
|
|
DATE_FORMAT(t1.form_date,'%Y-%m-%d') <= #{endDate}
|
|
)
|
|
)
|
|
</if>
|
|
</if>
|
|
|
|
+ <if test="dateFilter != null">
|
|
|
|
+ AND (
|
|
|
|
+ DATE_FORMAT(t1.verify_date,'%Y-%m-%d') >= #{dateFilter[0]}
|
|
|
|
+ AND
|
|
|
|
+ DATE_FORMAT(t1.verify_date,'%Y-%m-%d') <= #{dateFilter[1]}
|
|
|
|
+ )
|
|
|
|
+ </if>
|
|
<if test="verifyStartDate != null and verifyEndDate != null">
|
|
<if test="verifyStartDate != null and verifyEndDate != null">
|
|
AND exists (
|
|
AND exists (
|
|
select 1 from work_flow_content where master_id = t1.id
|
|
select 1 from work_flow_content where master_id = t1.id
|