diff --git a/oms_web/oms_vue/src/views/approve/all/index.vue b/oms_web/oms_vue/src/views/approve/all/index.vue index f685ab4b..e065f1c3 100644 --- a/oms_web/oms_vue/src/views/approve/all/index.vue +++ b/oms_web/oms_vue/src/views/approve/all/index.vue @@ -935,6 +935,7 @@ export default { this.$modal.msgSuccess(this.ticketConfirmDialogTitle + '成功') this.ticketDialogVisible = false this.getList() + this.getTotal() }).catch(error => { console.error('审批失败: ', error) this.$modal.msgError('审批失败!' + (error.msg || error.message)) @@ -1138,6 +1139,7 @@ export default { this.currentOrderId = null this.showApproveButtons = false this.getList() + this.getTotal() }, handleApproveConfirm() { if (this.$refs.approveDialog) { diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml index 32d3bceb..ec4a396a 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml @@ -67,6 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('order_approve_online', 'order_approve_offline') and t1.order_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('order_approve_online', 'order_approve_offline') + and t1.order_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -133,6 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('purchase_order_online') and t1.purchase_no = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('purchase_order_online') + and t1.purchase_no = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -200,6 +210,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_payment') and t1.payment_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_payment') + and t1.payment_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -267,6 +282,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_refund') and t1.payment_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_refund') + and t1.payment_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -334,6 +354,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('fianance_ticket') and t1.ticket_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('fianance_ticket') + and t1.ticket_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -401,6 +426,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_ticket_refound') and t1.ticket_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_ticket_refound') + and t1.ticket_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -468,6 +498,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_receipt_approve') and t1.receipt_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_receipt_approve') + and t1.receipt_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -535,6 +570,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_receipt_refound') and t1.receipt_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_receipt_refound') + and t1.receipt_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -602,6 +642,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_invoice_approve') and t1.invoice_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_invoice_approve') + and t1.invoice_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -669,6 +714,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_invoice_refound') and t1.invoice_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_invoice_refound') + and t1.invoice_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) @@ -709,6 +759,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('order_approve_online', 'order_approve_offline') and t1.order_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('order_approve_online', 'order_approve_offline') + and t1.order_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -726,6 +781,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('purchase_order_online') and t1.purchase_no = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('purchase_order_online') + and t1.purchase_no = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -744,6 +804,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_payment') and t1.payment_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_payment') + and t1.payment_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -762,6 +827,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_refund') and t1.payment_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_refund') + and t1.payment_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -780,6 +850,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('fianance_ticket') and t1.ticket_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('fianance_ticket') + and t1.ticket_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -798,6 +873,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_ticket_refound') and t1.ticket_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_ticket_refound') + and t1.ticket_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -816,6 +896,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_receipt_approve') and t1.receipt_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_receipt_approve') + and t1.receipt_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -834,6 +919,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_receipt_refound') and t1.receipt_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_receipt_refound') + and t1.receipt_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -852,6 +942,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_invoice_approve') and t1.invoice_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_invoice_approve') + and t1.invoice_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) union all @@ -870,6 +965,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where btc.process_key in ('finance_invoice_refound') and t1.invoice_bill_code = btc.business_key and btc.approve_user = #{approveUser} + union all + select 1 from bu_todo as bt + where bt.process_key in ('finance_invoice_refound') + and t1.invoice_bill_code = bt.business_key + and bt.approve_user = #{approveUser} ) ) as t