From cb375054eeaa7be5b69af718c7571a861dd870fd Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Mon, 11 Sep 2023 16:28:32 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=8E=BB=E6=8E=89=E8=89=BA=E9=BE=99?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=B7=A8=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BbycfpbbcxMapper.xml    |  6 +++---
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml    |  2 --
 .../main/resources/mapper/job/TDxRecordInvoiceDao.xml |  4 +---
 dxhy-erp/src/main/resources/mapper/SignedDao.xml      | 11 +++--------
 .../resources/mapper/DomesticRecordInvoiceMapper.xml  |  4 ----
 .../src/main/resources/mapper/ExtBbycfpbbcxMapper.xml |  8 +++-----
 .../src/main/resources/mapper/SignInvoiceMapper.xml   |  4 +---
 .../main/resources/mapper/SignRecordInvoiceMapper.xml |  8 ++------
 8 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
index d7e5954b..306b8229 100644
--- a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml
@@ -49,7 +49,7 @@
 
         select t.invoice_status yczt,o.taxno gfsh,o.taxname gfmc,count(1)
         hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
-        from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no = o.taxno
+        from ${dxhyTertiary}.t_dx_record_invoice t
         where t.invoice_status != '0'
         and t.invoice_type in ('01','03','08','14')
         and to_char(t.invoice_date,'yyyy-mm-dd') between #{kpksrq} and #{kpjsrq}
@@ -68,7 +68,7 @@
         <if test="company !=null and company !=''">
             and t.company = #{company}
         </if>
-        group by t.invoice_status,o.taxno,o.taxname
+        group by t.invoice_status,t.gf_tax_no,t.gf_name
     </select>
 
     <select id="selectHjxx" parameterType="java.util.Map"
@@ -95,7 +95,7 @@
     <select id="selectHjxx" parameterType="java.util.Map"
             resultMap="hjxxMap" databaseId="oracle">
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
-        from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no = o.taxno
+        from ${dxhyTertiary}.t_dx_record_invoice t
         where t.invoice_status != '0'
         and t.invoice_type in ('01','03','14')
         and t.invoice_date between to_date(#{kpksrq},'yyyy-mm-dd hh24:mi:ss') and to_date(#{kpjsrq},'yyyy-mm-dd
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 22646925..1248423f 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -371,7 +371,6 @@
         select
         <include refid="Authentication_Check_Column_List"/>
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime}
         and (t.rzlx = '2' or t.rzlx = '3')
         and t.export_mark = '0'
@@ -443,7 +442,6 @@
         rzh_date,rzh_yesorno,auth_status,rzlx,gx_user_name,
         rzh_belong_date,b.business_name dept_id
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE to_char(t.invoice_date,'yyyy-mm-dd') between #{invoiceStartTime} and #{invoiceEndTime}
         and (t.rzlx = '2' or t.rzlx = '3')
         and t.export_mark = '0'
diff --git a/dxhy-core/src/main/resources/mapper/job/TDxRecordInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/job/TDxRecordInvoiceDao.xml
index af21642f..b44dc314 100644
--- a/dxhy-core/src/main/resources/mapper/job/TDxRecordInvoiceDao.xml
+++ b/dxhy-core/src/main/resources/mapper/job/TDxRecordInvoiceDao.xml
@@ -545,9 +545,7 @@
     <select id="selectByScan" parameterType="java.lang.String" resultType="com.dxhy.core.job.entity.InvoiceScanEntity">
         select invoice_code invoiceCode, invoice_no invoiceNo, qs_type qsType, qs_status qsStatus, qs_date qsDate
         from t_dx_invoice d
-                 LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno = 1
-          and d.uuid = #{uuid}
+        where d.uuid = #{uuid}
     </select>
 
     <!-- 获取底账表中该税号下最后的开票日期 -->
diff --git a/dxhy-erp/src/main/resources/mapper/SignedDao.xml b/dxhy-erp/src/main/resources/mapper/SignedDao.xml
index 6edf428a..41b5e030 100644
--- a/dxhy-erp/src/main/resources/mapper/SignedDao.xml
+++ b/dxhy-erp/src/main/resources/mapper/SignedDao.xml
@@ -29,17 +29,14 @@
                d.create_date
         from t_dx_record_invoice ri
                  left join t_dx_invoice d on d.uuid = ri.uuid
-                 LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno = '1'
-          and ri.qs_status = '1'
+        where ri.qs_status = '1'
           and <![CDATA[ri.qs_date >= #{startDate}]]>
           and <![CDATA[ri.qs_date < #{endDate}]]>
           and ri.gf_tax_no = #{gfTaxNo}
     </select>
     <select id="selectByCount" resultType="java.lang.Integer">
         select count(*) from t_dx_record_invoice ri left join t_dx_invoice d on d.uuid = ri.uuid
-        LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno=1 and ri.qs_status=1 and <![CDATA[ri.qs_date>=#{startDate}]]> and
+        where ri.qs_status=1 and <![CDATA[ri.qs_date>=#{startDate}]]> and
         <![CDATA[ri.qs_date<#{endDate}]]>
         <if test="gfTaxNo != null and gfTaxNo!= ''">
             and ri.gf_tax_no=#{gfTaxNo}
@@ -70,9 +67,7 @@
                d.create_date
         from t_dx_record_invoice ri
                  left join t_dx_invoice d on d.uuid = ri.uuid
-                 LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno = '1'
-          and ri.qs_status = '1'
+        where ri.qs_status = '1'
           and ri.invoice_no = #{invoiceNo}
           and ri.invoice_code = #{invoiceCode}
     </select>
diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
index 266a8842..5aded362 100644
--- a/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
+++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticRecordInvoiceMapper.xml
@@ -1628,7 +1628,6 @@
         <include refid="Authentication_Column_List"/>
         ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime}
         and t.gf_tax_no = #{gfsh}
         and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
@@ -1677,7 +1676,6 @@
         <include refid="Authentication_Check_Column_List"/>
         ,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.bzdh,t.bzr,t.inaccount_status,t.comp_code
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{invoiceStartTime} and #{invoiceEndTime}
         and t.gf_tax_no = #{gfsh}
         and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
@@ -1867,7 +1865,6 @@
         select
         <include refid="Authentication_Column_List_Oracle"/>
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE TO_CHAR(t.invoice_date,'yyyy-MM-dd') between #{invoiceStartTime} and #{invoiceEndTime}
         and t.rzh_yesorno = '0'
         and t.auth_status in('0','5','6')
@@ -1924,7 +1921,6 @@
         select
         <include refid="Authentication_Check_Column_List_Oracle"/>
         from t_dx_record_invoice t
-        left join ${dxhyAdmin}.sys_business b on t.dept_id = b.business_code
         WHERE TO_CHAR(t.invoice_date,'yyyy-MM-dd') between #{invoiceStartTime} and #{invoiceEndTime}
         and (t.rzlx = '2' or t.rzlx = '3')
         and t.export_mark = '0'
diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml
index 030ed506..44a89a10 100644
--- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml
+++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpbbcxMapper.xml
@@ -48,8 +48,7 @@
 
         select t.invoice_status yczt,o.taxno gfsh,o.taxname gfmc,count(1)
         hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
-        from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no =
-        o.taxno
+        from ${dxhyTertiary}.t_dx_record_invoice t
         where t.invoice_status != '0'
         and t.invoice_type in ('01','03','08','14')
         and t.company = #{company}
@@ -67,7 +66,7 @@
             </otherwise>
         </choose>
 
-        group by t.invoice_status,o.taxno,o.taxname
+        group by t.invoice_status,t.gf_tax_no,t.gf_name
     </select>
 
     <select id="selectHjxx" parameterType="java.util.Map"
@@ -94,8 +93,7 @@
             resultMap="hjxxMap" databaseId="oracle">
 
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
-        from ${dxhyTertiary}.t_dx_record_invoice t left join ${dxhyAdmin}.sys_dept o on t.gf_tax_no =
-        o.taxno
+        from ${dxhyTertiary}.t_dx_record_invoice t
         where t.invoice_status != '0'
         and t.invoice_type in ('01','03','08','14')
         and t.company = #{company}
diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
index 6759ba8d..a51a04d7 100644
--- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml
@@ -439,9 +439,7 @@
     <select id="queryByUuid" resultType="com.dxhy.sign.entity.TDxInvoice" databaseId="mysql">
         SELECT *
         FROM t_dx_invoice d
-                 LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno = 1
-          AND d.qs_status = 1
+        where d.qs_status = 1
           and d.uuid = #{uuid}
     </select>
 
diff --git a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
index 10456f53..817ef2ff 100644
--- a/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
+++ b/dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml
@@ -239,9 +239,7 @@
         invoiceDate,t.invoice_code,t.invoice_no,t.gf_name,t.xf_name,truncate(t.invoice_amount,2) as
         invoiceAmount,truncate(t.tax_amount,2) as taxAmount,DATE_FORMAT(t.qs_date,'%Y-%m-%d %T') as qsDate,t.uuid
         from t_dx_record_invoice t left join t_dx_invoice d on d.uuid = t.uuid
-        LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno=1
-        and t.company = 'YL' and t.gf_tax_no in
+        where t.company = 'YL' and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -257,9 +255,7 @@
             resultMap="WqshjResultMap" databaseId="mysql">
         select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
         from t_dx_record_invoice t left join t_dx_invoice d on d.uuid = t.uuid
-        LEFT JOIN ${dxhyAdmin}.sys_user u on d.user_account = u.user_id
-        where u.push_yesorno=1
-        and t.company = 'YL' and t.gf_tax_no in
+        where t.company = 'YL' and t.gf_tax_no in
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>