From 737998b02037098dc490d85e60d3f9fe145f5a66 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 16 May 2023 08:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/controller/ExcelController.java | 7 ++ .../dxhy/core/thread/CustomExportThread.java | 6 ++ .../dxhy/core/thread/PoolAddTaxThread.java | 6 ++ .../com/dxhy/core/thread/PoolOtherThread.java | 7 ++ .../com/dxhy/core/thread/PoolSaleThread.java | 6 ++ .../core/thread/QypcsmkpExportThread.java | 4 ++ .../dxhy/core/thread/RzFpxxExportThread.java | 2 + .../main/resources/mapper/CustomsMapper.xml | 23 +++++-- .../main/resources/mapper/ExtPaperMapper.xml | 66 +++++++++++++++---- .../src/main/resources/mapper/FpZhMapper.xml | 6 ++ .../main/resources/mapper/TicketMapper.xml | 22 +++++-- 11 files changed, 135 insertions(+), 20 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 56bb1184..5fe36973 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 @@ -191,6 +191,13 @@ public class ExcelController extends AbstractController { // 非查验综合查询、查验明细导出处理 if (!"30".equals(serviceType) && !"29".equals(serviceType)) { +// String companyCode = prams.getString("companyCode"); +// if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ +// pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); +// log.info("组织机构====>{}",pramsMap.get("companyCodes")); +// } + prams.put("companyCodes",getUserInfo().getCompanyCodes()); + // 判断购方税号是否为全部 if ("99".equals(gfsh)) { StringBuffer newGfsh = new StringBuffer(); 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 b9b71495..f25ebdaa 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 @@ -2,6 +2,7 @@ package com.dxhy.core.thread; import java.util.*; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; import com.dxhy.common.util.ExcelPoiUtil; @@ -143,12 +144,17 @@ public class CustomExportThread extends BaseThread { String businessCode = prams.getString("businessCode"); String company = prams.getString("company"); String menuId = prams.getString("menuId"); + String companyCode = prams.getString("companyCode"); + JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + List companyCodes = companyCodeArray.toJavaList(String.class); // JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("business", businesses); pramsMap.put("keyWord", prams.getString("keyWord")); + pramsMap.put("companyCode",companyCode); + pramsMap.put("companyCodes",companyCodes); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 01e5c099..5faa415a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -13,6 +13,7 @@ import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteTable; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; import com.dxhy.common.util.CellWriteHandler; @@ -146,6 +147,9 @@ public class PoolAddTaxThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String inAccountMonth = prams.getString("inAccountMonth"); String company = prams.getString("company"); + String companyCode = prams.getString("companyCode"); + JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); @@ -197,6 +201,8 @@ public class PoolAddTaxThread extends BaseThread { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); + pramsMap.put("companyCodes",companyCodes); + pramsMap.put("companyCode",companyCode); // 导出文件名 StringBuilder ftpFileName = new StringBuilder(); ftpFileName.append(fileNamePrefix); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 8793c10a..09d03f00 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -2,6 +2,7 @@ package com.dxhy.core.thread; import java.util.*; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; import com.dxhy.common.util.ExcelPoiUtil; @@ -147,6 +148,12 @@ public class PoolOtherThread extends BaseThread { pramsMap.put("qsfs", qsfs); pramsMap.put("invoiceType", invoiceType); pramsMap.put("company", company); + String companyCode = prams.getString("companyCode"); + JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + List companyCodes = companyCodeArray.toJavaList(String.class); + pramsMap.put("companyCode",companyCode); + pramsMap.put("companyCodes",companyCodes); + // 导出文件名 StringBuilder ftpFileName = new StringBuilder(); ftpFileName.append(fileNamePrefix); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index e3279f72..e0b221db 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -13,6 +13,7 @@ import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteTable; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; import com.dxhy.common.util.CellWriteHandler; @@ -150,6 +151,9 @@ public class PoolSaleThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String gfTaxNo = prams.getString("gfTaxNo"); String company = prams.getString("company"); + String companyCode = prams.getString("companyCode"); + JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); @@ -186,6 +190,8 @@ public class PoolSaleThread extends BaseThread { pramsMap.put("fpzt", fpzt); pramsMap.put("listMark", listMark); pramsMap.put("remark", remark); + pramsMap.put("companyCode",companyCode); + pramsMap.put("companyCodes",companyCodes); if (inAccountMonth == null && "".equals(inAccountMonth) && !"1".equals(inAccountMonth)) { pramsMap.put("inAccountMonth", ""); }else { 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 58339824..a72dec4c 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 @@ -5,6 +5,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; import com.dxhy.common.util.ExcelPoiUtil; @@ -116,6 +117,9 @@ public class QypcsmkpExportThread extends BaseThread { JSONObject prams = JSONObject.parseObject(condition); prams.put("dbName", dbName); // 参数转换为需要的形式 + JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + List companyCodes = companyCodeArray.toJavaList(String.class); + prams.put("companyCodes",companyCodes); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); List gfshList = new ArrayList<>(); 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 80f1f267..cc64ea54 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 @@ -132,6 +132,7 @@ public class RzFpxxExportThread extends BaseThread { String rzhr = prams.getString("rzhr"); String company = prams.getString("company"); String menuId = prams.getString("menuId"); + String companyCode = prams.getString("companyCode"); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); List businesses = (List)prams.get("userBusiness"); String inAccountStatus = prams.getString("inAccountStatus"); @@ -226,6 +227,7 @@ public class RzFpxxExportThread extends BaseThread { pramsMap.put("rzhr", Arrays.asList(split1)); } } + pramsMap.put("companyCode",companyCode); pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("qsr", prams.getString("qsr")); diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index e2756685..b22870c4 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -46,10 +46,11 @@ t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date, data_sources from t_dx_customs_record t - where export_mark = '0' and t.gf_tax_no in - - #{item} - + where export_mark = '0' + + + + and t.customs_code like CONCAT('%',#{keyWord},'%') @@ -141,6 +142,20 @@ and t.account_period = #{accountPeriod} + + 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 = '' or t.comp_code is null) + order by t.fill_in_date desc diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index b229fd5b..df28e736 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -113,10 +113,10 @@ AND CONCAT(IFNULL(invoice_code,''),IFNULL(invoice_no,'')) like CONCAT('%',#{keyWord},'%') - and gf_tax_no in - - #{item} - + + + + and invoice_type = #{invoiceType} @@ -132,6 +132,20 @@ and qs_type = #{qsfs} + + and (comp_code in + + #{companyCode} + + or comp_code is null or comp_code = '' + ) + + + and comp_code = #{companyCode} + + + and (comp_code is null or comp_code = '') + GROUP BY uuid having min(create_date) ORDER BY create_date DESC @@ -193,10 +207,10 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type = #{invoiceType} @@ -251,6 +265,20 @@ and t.account_period = #{accountPeriod} + + 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 = '' or t.comp_code is null) + diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 3c7ddfb7..6f259972 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -98,6 +98,12 @@ #{item} + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/resources/mapper/TicketMapper.xml b/dxhy-core/src/main/resources/mapper/TicketMapper.xml index d2067372..ee19bbed 100644 --- a/dxhy-core/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TicketMapper.xml @@ -63,10 +63,10 @@ and CONCAT(IFNULL(t.passenger,''),IFNULL(t.passenger_s_f_z_h,'')) like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type in #{item} @@ -89,6 +89,20 @@ and t.company = #{company} + + 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 = '') +