diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 80d8a417..c7ef4abd 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -71,7 +71,7 @@ t.rzh_belong_date as dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status, t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d') bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date, - voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,tax_rate + voucher_number,t.ele_invoice_no, sn_voucher_number, account_period, posting_time ,image_id,t.tax_rate from t_dx_record_invoice t WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index ada14005..b9295fa1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -150,6 +150,7 @@ public class ManualAthensThread extends BaseThread { String cjjsyf = prams.getString("cjjsyf"); String gfTaxNo = prams.getString("gfTaxNo"); String bzr = prams.getString("bzr"); + String taxRate = String.valueOf(prams.getInteger("taxRate")); String suspendStatus = prams.getString("suspendStastus"); String suspendDate = prams.getString("suspendDate"); String inAccountStatus = prams.getString("inAccountStatus"); @@ -221,6 +222,7 @@ public class ManualAthensThread extends BaseThread { pramsMap.put("rzzt", rzzt); pramsMap.put("rzlx", rzlx); pramsMap.put("rzr", rzr); + pramsMap.put("taxRate", taxRate); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java index 28d820dc..6c674297 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java @@ -140,6 +140,7 @@ public class RzFpxxExportThread extends BaseThread { String menuId = prams.getString("menuId"); String bzdh = prams.getString("bzdh"); String bzr = prams.getString("bzr"); + String taxRate = String.valueOf(prams.getInteger("taxRate")); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); String snVoucherNumber = prams.getString("snVoucherNumber"); String imageNumber = prams.getString("imageNumber"); @@ -176,6 +177,7 @@ public class RzFpxxExportThread extends BaseThread { pramsMap.put("paymentStatus", prams.getString("paymentStatus")); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("taxRate", taxRate); pramsMap.put("companyCodes",companyCodes); if (StringHelper.isBlank(gfsh)){ diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 28250108..d48067b9 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -259,6 +259,12 @@ and t.account_period = #{accountPeriod} + + and t.tax_rate = #{taxRate} + + + and t.tax_rate like '%,%' + order by t.rzh_date desc,t.invoice_date desc