From 71fd7cb55fe4b87ad95b0d309ce78d28b63916df Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 22 Aug 2023 14:28:39 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=A5=A8=E6=B1=A0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/controller/ExcelController.java | 13 +------------ .../com/dxhy/core/thread/CustomExportThread.java | 9 +-------- .../com/dxhy/core/thread/QypcsmkpExportThread.java | 1 + .../src/main/resources/mapper/CustomsMapper.xml | 7 ++----- .../src/main/resources/mapper/TicketMapper.xml | 13 +------------ .../main/resources/mapper/ExtInvoicePoolMapper.xml | 2 -- .../src/main/resources/mapper/TicketMapper.xml | 5 ++--- 7 files changed, 8 insertions(+), 42 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java index d37ad1a6..08d36d26 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java @@ -231,18 +231,7 @@ public class ExcelController extends AbstractController { String newCondition = prams.toString(); pramsMap.put("conditions", newCondition); } else { - String gfmc = ""; - List org = getUserInfo().getOrg(); - if (org != null && org.size() > 0) { - for (Tax tax : org) { - if (tax.getTaxno().equals(gfsh)) { - gfmc = tax.getTaxname(); - } - } - } - prams.put("gfmc", gfmc); - String newCondition = prams.toString(); - pramsMap.put("conditions", newCondition); + prams.put("gfsh", gfsh); } } else { pramsMap.put("conditions", condition); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java index 9e98e09a..8c3f2132 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java @@ -176,15 +176,8 @@ public class CustomExportThread extends BaseThread { pramsMap.put("imageNumber",imageNumber); pramsMap.put("postingTimeEnd",postingTimeEnd); pramsMap.put("postingTimeStart",postingTimeStart); + pramsMap.put("gfsh", gfsh); - - List gfshList = new ArrayList<>(); - if (!StringHelper.isBlank(gfsh)) { - gfshList = StringHelper.stringToList(gfsh); - pramsMap.put("gfsh", gfshList); - } else { - pramsMap.put("gfsh", gfshList); - } if (!StringHelper.isBlank(customsCode)) { pramsMap.put("customsCode", customsCode); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index 48de0b06..e42ef5b0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -124,6 +124,7 @@ public class QypcsmkpExportThread extends BaseThread { prams.put("companyCodes",companyCodes); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + prams.put("gfsh", gfsh); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index 50dfc995..a007b033 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -50,10 +50,7 @@ data_sources from t_dx_customs_record t where export_mark = '0' - - - - + and t.gf_tax_no = #{gfsh} and t.customs_code like CONCAT('%',#{keyWord},'%') @@ -149,7 +146,7 @@ and t.account_period = #{accountPeriod} - and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null) + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) order by t.fill_in_date desc diff --git a/dxhy-core/src/main/resources/mapper/TicketMapper.xml b/dxhy-core/src/main/resources/mapper/TicketMapper.xml index cd8932f6..e88bbacb 100644 --- a/dxhy-core/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TicketMapper.xml @@ -113,19 +113,8 @@ and t.sn_voucher_number = #{snVoucherNumber} - - and (t.comp_code in - - #{companyCode} - - or t.comp_code is null or t.comp_code = '' - ) - - and t.comp_code = #{companyCode} - - - and (t.comp_code is null or t.comp_code = '') + and (t.comp_code = #{companyCode} or t.comp_code is null or t.comp_code = '') diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 1fd45482..65eaef0f 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -281,7 +281,6 @@ t_dx_invoice_reimburse where invoice_type in ('91','94','95','00','97','98','101','102','103','99') - and gf_tax_no = #{gfsh} and (comp_code = #{companyCode} or comp_code = '' or comp_code is null) AND create_date between #{cjksyf} and #{cjjsyf} @@ -363,7 +362,6 @@ t_dx_invoice_reimburse where invoice_type in ('91','94','95','00','97','98','101','102','103','99') - and gf_tax_no = #{gfsh} and (comp_code = #{companyCode} or comp_code = '' or comp_code is null) AND create_date between #{cjksyf} and #{cjjsyf} diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index b41d970e..1a31fbb5 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -12,9 +12,8 @@ resultMap="InvoicePoolHjResultMap" databaseId="mysql"> select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse from t_dx_invoice_reimburse t - where t.gf_tax_no = #{gfsh} + where 1=1 and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) - and t.invoice_date between #{kpksrq} and #{kpjsrq} @@ -82,7 +81,7 @@ resultType="com.dxhy.extend.entity.ExtTicketInvoiceModel" databaseId="mysql"> select * from t_dx_invoice_reimburse t - where t.gf_tax_no = #{gfsh} + where 1=1 and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) and t.invoice_date between #{kpksrq} and #{kpjsrq}