From b370678f35ddaf24c6d6e93e08580520e89b8a11 Mon Sep 17 00:00:00 2001 From: yefei Date: Fri, 25 Aug 2023 16:25:32 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/thread/JkszhcxExportThread.java | 10 +++------- .../java/com/dxhy/core/thread/YcfpcxExportThread.java | 2 ++ dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml | 3 +++ dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml | 8 ++++---- .../src/main/resources/mapper/ExtBbfpzhMapper.xml | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/JkszhcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/JkszhcxExportThread.java index eb8fb1ad..9c76e1d3 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/JkszhcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/JkszhcxExportThread.java @@ -114,6 +114,7 @@ public class JkszhcxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String customsCode = prams.getString("customsCode"); String fillInStartDate = prams.getString("fillInStartDate"); String fillInEndDate = prams.getString("fillInEndDate"); @@ -141,13 +142,8 @@ public class JkszhcxExportThread extends BaseThread { pramsMap.put("dbName", dbName); pramsMap.put("business", businesses); - List gfshList = new ArrayList<>(); - if (!StringHelper.isBlank(gfsh)) { - gfshList = StringHelper.stringToList(gfsh); - pramsMap.put("gfsh", gfshList); - } else { - pramsMap.put("gfsh", gfshList); - } + pramsMap.put("gfsh", gfsh); + pramsMap.put("companyCode", companyCode); if (!StringHelper.isBlank(customsCode)) { pramsMap.put("customsCode", customsCode); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpcxExportThread.java index 59831392..b7e7caaa 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/YcfpcxExportThread.java @@ -115,6 +115,7 @@ public class YcfpcxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String kpksrq = prams.getString("kpksrq"); String kpjsrq = prams.getString("kpjsrq"); String qszt = prams.getString("qszt"); @@ -157,6 +158,7 @@ public class YcfpcxExportThread extends BaseThread { } else { pramsMap.put("gfsh", gfshList); } + pramsMap.put("companyCode", companyCode); pramsMap.put("businessCode", "99"); if (!StringHelper.isBlank(qszt)) { if (!"99".equals(qszt)) { diff --git a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml index ef6ccf33..44983086 100644 --- a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml @@ -55,6 +55,9 @@ #{item} + + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + and t.bzdh = #{bzdh} diff --git a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml index 7f7cf965..77e5039f 100644 --- a/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/JkszhcxMapper.xml @@ -36,10 +36,10 @@ DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt,t.dept_name from t_dx_customs_record t - where export_mark = '0' and t.gf_tax_no in - - #{item} - + where export_mark = '0' and t.gf_tax_no = #{gfsh} + + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + and t.customs_code = #{customsCode} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 9c321853..e02ab718 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -67,7 +67,7 @@ t.invoice_type , t.dept_name deptName,t.glzt glzt,t.uuid,t.bdk_status,t.scan_id,t.in_account_status,t.settle_source, t.settlement_no,t.inaccount_status,t.bzdh, - t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period + t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,t.comp_code,t.bzdh from t_dx_record_invoice t WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq}