111111

ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml

@@ -34,13 +34,13 @@
     left join (select a.* from (select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id
     ,b.voucher_id, '' voucher_state
     from t_entry_bill a left join
-    t_entry_bill_flow b on a.id=b.entry_id
+    t_entry_bill_flow b on a.id=b.entry_id and  a.available='Yes' and b.available='Yes'
     left join t_voucher c on c.id=b.voucher_id
     where b.entry_type in('到款转暂存')  )a
     left join
     (select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id
     ,b.voucher_id,c.voucher_state  from t_entry_bill a left join
-    t_entry_bill_flow b on a.id=b.entry_id
+    t_entry_bill_flow b on a.id=b.entry_id and  a.available='Yes' and b.available='Yes'
     left join t_voucher c on c.id=b.voucher_id
     where b.entry_type in('暂存转收入') ) b
     on a.income_id=b.income_id where b.income_id is null
@@ -48,13 +48,13 @@
 
     (select b.* from (select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id
     ,b.voucher_id,c.voucher_state from t_entry_bill a left join
-    t_entry_bill_flow b on a.id=b.entry_id
+    t_entry_bill_flow b on a.id=b.entry_id and  a.available='Yes' and b.available='Yes'
     left join t_voucher c on c.id=b.voucher_id
     where b.entry_type in('到款转暂存') )a
     left join
     (select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id
     ,b.voucher_id,c.voucher_state  from t_entry_bill a left join
-    t_entry_bill_flow b on a.id=b.entry_id
+    t_entry_bill_flow b on a.id=b.entry_id and  a.available='Yes' and b.available='Yes'
     left join t_voucher c on c.id=b.voucher_id
     where b.entry_type in('暂存转收入') ) b
     on a.income_id=b.income_id where b.income_id is not null )
@@ -62,7 +62,7 @@
     (
     select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id
     ,b.voucher_id,c.voucher_state from t_entry_bill a left join
-    t_entry_bill_flow b on a.id=b.entry_id
+    t_entry_bill_flow b on a.id=b.entry_id and  a.available='Yes' and b.available='Yes'
     left join t_voucher c on c.id=b.voucher_id
     where b.entry_type in('到款转收入')
     )
@@ -71,7 +71,7 @@
     left join t_bank_account_number j on j.bank_number=a.income_account and j.available='Yes'
 
    <where>
-         FIND_IN_SET(#{code}, b.finance_code)
+         FIND_IN_SET(#{code}, b.finance_code)  and  a.available='Yes'
 
     <if test="qry.voucherState.contains('已入账')  ">
         and  (a.income_speed='入账' or a.income_speed='完成')
@@ -158,7 +158,7 @@
         <where> a.income_speed='完成' and a.available='Yes'
             and d.voucher_state='已入账' and e.entry_type in('到款转收入','暂存转收入')
             and g.invoice_type='补开票' and  FIND_IN_SET(#{code}, b.finance_code)
-            and h.invoice_state='已开'
+            and h.invoice_state='已开' and  e.available='Yes'  and  d.available='Yes'
             <if test="qry.billNo != null and qry.billNo!=''">
                 and bill_no like concat('%',#{qry.billNo},'%')
             </if>
@@ -227,7 +227,7 @@
 
 
         left join t_entry_bill b on a.id=b.income_id
-        left join t_entry_bill_flow c on c.entry_id=b.id
+        left join t_entry_bill_flow c on c.entry_id=b.id  and  c.available='Yes'
         and c.entry_type='到款转暂存'
         left join t_voucher d on d.id=c.voucher_id and d.voucher_state!='驳回'
         and   d.available='Yes'