diff --git a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml index 8e9064ef..9c247946 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpmxMapper.xml @@ -36,8 +36,8 @@ b.detail_no,b.unit,b.goods_name,b.model,b.num,b.unit_price,b.detail_amount,b.tax_rate,b.tax_amount, b.cph,b.lx,b.txrqq,b.txrqz FROM - ${dxhyTertiary}.t_dx_record_invoice t - left join ${dxhyDetail}.t_dx_record_invoice_detail b on t.uuid = b.uuid + t_dx_record_invoice t + left join t_dx_record_invoice_detail b on t.uuid = b.uuid where t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no in @@ -75,8 +75,8 @@ b.detail_no,b.unit,b.goods_name,b.model,b.num,b.unit_price,b.detail_amount,b.tax_rate,b.tax_amount, b.cph,b.lx,b.txrqq,b.txrqz FROM - ${dxhyTertiary}.t_dx_record_invoice t - left join ${dxhyDetail}.t_dx_record_invoice_detail b on t.uuid = b.uuid + t_dx_record_invoice t + left join t_dx_record_invoice_detail b on t.uuid = b.uuid where t.invoice_date between to_date(#{kpksrq},'yyyy-mm-dd hh24:mi:ss') and to_date(#{kpjsrq},'yyyy-mm-dd hh24:mi:ss') and t.gf_tax_no in diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhmxMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhmxMapper.xml index 5e2684b0..d6d0c3df 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhmxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhmxMapper.xml @@ -49,8 +49,8 @@ dj,b.detail_amount je,b.tax_amount se,b.tax_rate sl, t.inaccount_status,b.cph,b.lx,b.txrqq,b.txrqz from - ${dxhyTertiary}.t_dx_record_invoice t - left JOIN ${dxhyDetail}.t_dx_record_invoice_detail b ON t.uuid = b.uuid + t_dx_record_invoice t + left JOIN t_dx_record_invoice_detail b ON t.uuid = b.uuid WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and t.gf_tax_no = #{gfsh} and (t.comp_code = #{companyCode} or t.comp_code is null or t.comp_code = '') @@ -198,8 +198,8 @@ dj,b.detail_amount je,b.tax_amount se,b.tax_rate sl, t.in_account_status,b.cph,b.lx,b.txrqq,b.txrqz from - ${dxhyTertiary}.t_dx_record_invoice t - left JOIN ${dxhyDetail}.t_dx_record_invoice_detail b ON t.uuid = b.uuid + t_dx_record_invoice t + left JOIN t_dx_record_invoice_detail b ON t.uuid = b.uuid where t.invoice_date between to_date(#{kpksrq},'yyyy-mm-dd hh24:mi:ss') and to_date(#{kpjsrq},'yyyy-mm-dd hh24:mi:ss') and t.gf_tax_no in diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml index 7eb4967f..16123e98 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 dxhy_detail.t_dx_record_invoice_detail tdis + left join t_dx_record_invoice_detail tdis on t.uuid = tdis.uuid where diff --git a/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpbbcxMapper.xml index 306b8229..1b390817 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 + from 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} @@ -95,7 +95,7 @@ diff --git a/dxhy-erp/src/main/resources/mapper/AllTaxesSaleDao.xml b/dxhy-erp/src/main/resources/mapper/AllTaxesSaleDao.xml index 61335d3d..5440e300 100644 --- a/dxhy-erp/src/main/resources/mapper/AllTaxesSaleDao.xml +++ b/dxhy-erp/src/main/resources/mapper/AllTaxesSaleDao.xml @@ -92,7 +92,7 @@ select distinct DATE_FORMAT(t.invoice_date,'%Y-%m-%d') invoiceDate,t.invoice_code,t.invoice_no,t.gf_name,t.gf_tax_no,t.invoice_amount,t.tax_amount,t.total_amount,t.invoice_type,t.invoice_status - from t_dx_sale_record_invoice t left join dxhy_detail.t_dx_record_invoice_detail_sales t1 on t.uuid = t1.uuid + from t_dx_sale_record_invoice t left join t_dx_record_invoice_detail_sales t1 on t.uuid = t1.uuid where t1.incentive_flag like CONCAT('%',#{yhzc},'%') and t1.tax_rate in diff --git a/dxhy-passengerTicket/src/main/resources/mapper/PassengerInvoiceStatisticsMapper.xml b/dxhy-passengerTicket/src/main/resources/mapper/PassengerInvoiceStatisticsMapper.xml index 424c884f..2b034aba 100644 --- a/dxhy-passengerTicket/src/main/resources/mapper/PassengerInvoiceStatisticsMapper.xml +++ b/dxhy-passengerTicket/src/main/resources/mapper/PassengerInvoiceStatisticsMapper.xml @@ -93,7 +93,7 @@ SELECT count(t.id) AS monthCount, sum(t.tax_amount) AS monthTaxAmount - FROM ${dxhyTertiary}.t_dx_invoice_reimburse t + FROM t_dx_invoice_reimburse t WHERE t.gf_tax_no = #{gfTaxNo} AND t.is_deduction = '0' @@ -104,8 +104,8 @@ AND ( (t.is_domestic = '0' AND t.invoice_type IN ('92', '89', '88', '87')) OR (t.invoice_type = '90' AND - exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.departure_city)) - AND exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.reaching_city))) + exists(select area_name from sys_city where locate(area_name, t.departure_city)) + AND exists(select area_name from sys_city where locate(area_name, t.reaching_city))) OR ( t.invoice_type = '10' AND t.invoice_date > '2019-04-01 00:00:00' @@ -119,7 +119,7 @@ databaseId="mysql"> SELECT count(t.id) AS yearCount, sum(t.tax_amount) AS yearTaxAmount - FROM ${dxhyTertiary}.t_dx_invoice_reimburse t + FROM t_dx_invoice_reimburse t WHERE t.gf_tax_no = #{gfTaxNo} AND YEAR(t.create_date) = #{year} @@ -127,8 +127,8 @@ AND ( (t.is_domestic = '0' AND t.invoice_type IN ('92', '89', '88', '87')) OR (t.invoice_type = '90' AND - exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.departure_city)) - AND exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.reaching_city))) + exists(select area_name from sys_city where locate(area_name, t.departure_city)) + AND exists(select area_name from sys_city where locate(area_name, t.reaching_city))) OR (t.invoice_type = '10' AND t.invoice_date > '2019-04-01 00:00:00' AND t.tag LIKE '%运输服务%') ) @@ -258,7 +258,7 @@ SELECT count(t.id) count, sum(t.tax_amount) taxAmountsum, sum(t.tax_amount) authenticationTaxAmountsum - FROM ${dxhyTertiary}.t_dx_invoice_reimburse t + FROM t_dx_invoice_reimburse t WHERE t.gf_tax_no = #{gfTaxNo} AND date_format(t.create_date, '%Y-%m-%d') >= date_format(#{monthStart}, '%Y-%m-%d') @@ -267,8 +267,8 @@ AND t.invoice_type = '90' AND t.is_deduction = '0' - AND exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.departure_city)) - AND exists(select area_name from ${dxhyAdmin}.sys_city where locate(area_name, t.reaching_city)) + AND exists(select area_name from sys_city where locate(area_name, t.departure_city)) + AND exists(select area_name from sys_city where locate(area_name, t.reaching_city))