From 64302406f68a3575b91487672b8102d277d5bb7b Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 9 Oct 2023 17:22:29 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E8=B7=A8=E5=BA=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/frJob/QueryDetailDataDao.xml          |  6 +++---
 .../resources/mapper/frJob/RecordToQueryDao.xml  | 16 ++++++++--------
 .../mapper/frJob/VoucherRecordItemDao.xml        |  4 ++--
 .../src/main/resources/mapper/ImageSubmitDao.xml |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
index c8676f7f..6ed32ac6 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml
@@ -38,7 +38,7 @@
 		sum(CAST(d.tax_amount as decimal(16,2))) as fpse,
 		v.sl,
 		v.create_time
-        from t_dx_record_invoice t inner join dxhy_detail.t_dx_record_invoice_detail d
+        from t_dx_record_invoice t inner join t_dx_record_invoice_detail d
         on t.uuid = d.uuid
         inner join (
             select r.zbzdh,
@@ -109,7 +109,7 @@
 		sum(CAST(d.detail_amount as decimal(16,2))) as fpse,
 		v.sl,
 		v.create_time
-        from t_dx_sale_record_invoice t inner join dxhy_detail.t_dx_record_invoice_detail_sales d
+        from t_dx_sale_record_invoice t inner join t_dx_record_invoice_detail_sales d
         on t.uuid = d.uuid
         inner join (
             select r.zbzdh,
@@ -156,7 +156,7 @@
 		sum(CAST(d.tax_amount as decimal(16,2))) as fpse,
 		v.sl,
 		v.create_time
-        from t_dx_sale_record_invoice t inner join dxhy_detail.t_dx_record_invoice_detail_sales d
+        from t_dx_sale_record_invoice t inner join t_dx_record_invoice_detail_sales d
         on t.uuid = d.uuid
         inner join (
             select r.zbzdh,
diff --git a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
index 06492244..30004d38 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
@@ -32,8 +32,8 @@
 		v.zbzdh as bzdh,
 		v.create_time
 	  FROM
-		dxhy_tertiary.voucher_record_item i
-		LEFT JOIN dxhy_tertiary.voucher_record v
+		voucher_record_item i
+		LEFT JOIN voucher_record v
 		ON v.id = i.relation_id
 		where i.racct like CONCAT(#{kjkmbh},'%')
 		and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
@@ -67,7 +67,7 @@
 
     <select id="getTaxAmount" parameterType="java.util.List" resultType="com.dxhy.core.entity.frJob.FpTaxAmount">
         select CONCAT(d.tax_rate,t.bzdh) as `key`,sum(CAST(d.tax_amount as decimal(20,2))) as fpse
-        from dxhy_detail.t_dx_record_invoice_detail d inner join t_dx_record_invoice t
+        from t_dx_record_invoice_detail d inner join t_dx_record_invoice t
         on d.uuid = t.uuid
         where t.bzdh in
         <foreach collection="bzdhs" item="bzdh" open="(" separator="," close=")">
@@ -92,8 +92,8 @@
 		v.zbzdh as bzdh,
 		v.create_time
 	  FROM
-		dxhy_tertiary.voucher_record_item i
-		LEFT JOIN dxhy_tertiary.voucher_record v
+		voucher_record_item i
+		LEFT JOIN voucher_record v
 		ON v.id = i.relation_id
 		where i.racct like CONCAT(#{kjkmbh},'%')
 		and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
@@ -104,7 +104,7 @@
     <select id="getXTaxAmount" parameterType="java.util.List" resultType="com.dxhy.core.entity.frJob.FpTaxAmount">
         select CONCAT(d.tax_rate,t.bzdh) as `key`,sum(CAST(d.tax_amount as decimal(20,2))) as fpse,
         sum(CAST(d.detail_amount as decimal(20,2))) as fpje
-        from dxhy_detail.t_dx_record_invoice_detail_sales d inner join t_dx_sale_record_invoice t
+        from t_dx_record_invoice_detail_sales d inner join t_dx_sale_record_invoice t
         on d.uuid = t.uuid
         where t.bzdh in
         <foreach collection="bzdhs" item="bzdh" open="(" separator="," close=")">
@@ -129,8 +129,8 @@
 		v.zbzdh as bzdh,
 		v.create_time
 	  FROM
-		dxhy_tertiary.voucher_record_item i
-		LEFT JOIN dxhy_tertiary.voucher_record v
+		voucher_record_item i
+		LEFT JOIN voucher_record v
 		ON v.id = i.relation_id
 		where i.racct like CONCAT(#{kjkmbh},'%')
 		and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
diff --git a/dxhy-core/src/main/resources/mapper/frJob/VoucherRecordItemDao.xml b/dxhy-core/src/main/resources/mapper/frJob/VoucherRecordItemDao.xml
index 4abe76ce..56c18369 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/VoucherRecordItemDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/VoucherRecordItemDao.xml
@@ -11,8 +11,8 @@
         i.id,
         i.racct
         FROM
-        dxhy_tertiary.voucher_record_item i
-        LEFT JOIN dxhy_tertiary.voucher_record v
+        voucher_record_item i
+        LEFT JOIN voucher_record v
         ON v.id = i.relation_id
         where DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
         and  i.racct like CONCAT(#{kjkmbh},'%')
diff --git a/dxhy-erp/src/main/resources/mapper/ImageSubmitDao.xml b/dxhy-erp/src/main/resources/mapper/ImageSubmitDao.xml
index 344a8b41..5369eaf5 100644
--- a/dxhy-erp/src/main/resources/mapper/ImageSubmitDao.xml
+++ b/dxhy-erp/src/main/resources/mapper/ImageSubmitDao.xml
@@ -139,7 +139,7 @@
         tax_rate
 
         from
-        dxhy_tertiary.t_dx_record_invoice
+        t_dx_record_invoice
         where
         uuid in
         <foreach collection="uuidList" open="(" close=")" item="id" separator=",">