|
|
@@ -55,7 +55,7 @@
|
|
55
|
55
|
AND btt.node_status IN ( 2, 3, 5,10 )
|
|
56
|
56
|
AND btt.is_deleted = 0 AND pne.link_type!='create'
|
|
57
|
57
|
GROUP BY
|
|
58
|
|
- btt.bill_id ) bt INNER JOIN bill_task ba ON bt.ct = ba.sort AND ba.bill_id=bt.bill_id AND ba.user_code = #{userCode}
|
|
|
58
|
+ btt.bill_id ) bt INNER JOIN bill_task ba ON bt.ct = ba.sort AND ba.bill_id=bt.bill_id AND ba.user_code = #{userCode} AND ba.is_deleted=0
|
|
59
|
59
|
GROUP BY ba.bill_id) approver ON
|
|
60
|
60
|
approver.bill_id = tb.id
|
|
61
|
61
|
LEFT JOIN toa_form tf ON tf.process_id=tp.id AND tf.is_deleted=0
|
|
|
@@ -95,7 +95,7 @@
|
|
95
|
95
|
INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
|
|
96
|
96
|
INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
|
|
97
|
97
|
bill_task ba
|
|
98
|
|
- WHERE node_status = 1 AND ba.user_code = #{approver}
|
|
|
98
|
+ WHERE node_status = 1 AND ba.user_code = #{approver} AND ba.is_deleted=0
|
|
99
|
99
|
ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
|
|
100
|
100
|
LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
|
|
101
|
101
|
brr.is_deleted = 0
|
|
|
@@ -140,7 +140,7 @@
|
|
140
|
140
|
FROM toa_bill tb INNER JOIN toa_process tp ON tp.id = tb.process_id
|
|
141
|
141
|
INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
|
|
142
|
142
|
LEFT JOIN (SELECT ba.id, ba.bill_id, ba.node_name, ba.task_id, ba.user_code,ba.action
|
|
143
|
|
- FROM (SELECT bill_id, max(sort) AS ct FROM bill_task GROUP BY bill_id) AS bt
|
|
|
143
|
+ FROM (SELECT bill_id, max(sort) AS ct FROM bill_task where is_deleted=0 GROUP BY bill_id) AS bt
|
|
144
|
144
|
INNER JOIN bill_task ba ON bt.ct = ba.sort AND bt.bill_id = ba.bill_id GROUP BY ba.bill_id)
|
|
145
|
145
|
approver
|
|
146
|
146
|
ON approver.bill_id = tb.id
|
|
|
@@ -224,7 +224,7 @@
|
|
224
|
224
|
INNER JOIN bill_data_json bdj ON bdj.bill_id = tb.id and bdj.is_deleted = 0
|
|
225
|
225
|
INNER JOIN (SELECT ba.node_name, ba.task_id, ba.user_code, ba.bill_id,ba.action FROM
|
|
226
|
226
|
bill_task ba
|
|
227
|
|
- WHERE node_status = 1 AND ba.user_code = #{approver}
|
|
|
227
|
+ WHERE node_status = 1 AND ba.user_code = #{approver} AND ba.is_deleted=0
|
|
228
|
228
|
ORDER BY sort DESC ) approver ON approver.bill_id = tb.id
|
|
229
|
229
|
LEFT JOIN bill_read_record brr ON brr.user_code = #{approver} AND brr.bill_id = tb.id and
|
|
230
|
230
|
brr.is_deleted = 0
|
