From ffe37b3318d5d6eb32db8b8262eaf4d0b72eb9d3 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 9 Aug 2023 01:18:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A8=8E=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml index 83bcb873..21f222f3 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml @@ -25,7 +25,7 @@ tdis.tax_rate taxRate, t.inaccount_status from t_dx_record_invoice t - left join t_dx_record_invoice_statistics tdis + left join dxhy_detail.t_dx_record_invoice_detail tdis on t.invoice_no = tdis.invoice_no and t.invoice_code = tdis.invoice_code From 7a240cba37d07d22453018baa1d0f50277e1295c Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Wed, 9 Aug 2023 01:29:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A8=8E=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml index 21f222f3..a7c24eed 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml @@ -27,8 +27,7 @@ from t_dx_record_invoice t left join dxhy_detail.t_dx_record_invoice_detail tdis - on t.invoice_no = tdis.invoice_no - and t.invoice_code = tdis.invoice_code + on t.uuid = tdis.uuid where t.invoice_date between #{kpksrq} and #{kpjsrq} and t.company = #{company}