From 98aafdd3557c8debfe1eb99ced5ba5cecce15489 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 8 Aug 2023 15:24:55 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=89=80=E5=B1=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=B8=BA=E7=BB=B4=E5=BA=A6=E5=AF=BC=E5=87=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/model/CautionAbnormalReqVO.java | 3 + .../impl/CustomsCollectServiceImpl.java | 747 ++++++++---------- .../core/thread/CustomsCollectThread.java | 11 +- .../core/thread/CustomsManualSignThread.java | 10 +- .../core/thread/CustomsRefundVeriThread.java | 11 +- .../core/thread/CustomsRzcxExportThread.java | 13 +- .../core/thread/CustomsSignQueryThread.java | 12 +- .../core/thread/ExportCustomsQueryThread.java | 10 +- .../thread/ExportCustomsRzcxExportThread.java | 2 + .../core/thread/ExportInvoiceQueryThread.java | 11 +- .../thread/ExportInvoiceRzcxExportThread.java | 13 +- .../dxhy/core/thread/FpqsExportThread.java | 4 +- .../core/thread/InvoiceOutExportThread.java | 9 +- .../dxhy/core/thread/QssbExportThread.java | 12 +- .../dxhy/core/thread/QstjbExportThread.java | 11 +- .../dxhy/core/thread/RzjgqdExportThread.java | 11 +- .../dxhy/core/thread/SgqsExportThread.java | 9 +- .../thread/TaxRebateAuthenticationThread.java | 5 +- .../dxhy/core/thread/YqswrzExportThread.java | 11 +- .../src/main/resources/mapper/FpZhMapper.xml | 3 + .../src/main/resources/mapper/QssbMapper.xml | 9 +- .../src/main/resources/mapper/QstjbMapper.xml | 18 +- .../src/main/resources/mapper/QsxxMapper.xml | 5 +- .../main/resources/mapper/RzjgqdMapper.xml | 6 +- .../src/main/resources/mapper/SgqsMapper.xml | 9 +- .../mapper/TDxCustomsRecordMapper.xml | 69 +- .../resources/mapper/TDxExportCustomsDao.xml | 21 +- .../resources/mapper/TDxExportInvoiceDao.xml | 14 +- 28 files changed, 501 insertions(+), 568 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java index b4123295..8c51a22b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CautionAbnormalReqVO.java @@ -16,6 +16,9 @@ public class CautionAbnormalReqVO extends BaseExportVO { * 购方税号 */ private String gfsh; + + private String companyCode; + /** * 发票号码 */ diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java index 3dac74e6..f92b3a04 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java @@ -44,7 +44,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public class CustomsCollectServiceImpl extends MpBaseServiceImpl - implements ICustomsCollectService { + implements ICustomsCollectService { @Resource private TDxExportInvoiceDao tDxExportInvoiceDao; @@ -60,56 +60,46 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 合计信息,仅第一页时需要统计，减少数据库压力 + if (curr == 1) { + String number = "0"; + String taxAmountSum = "0"; + Map data = super.baseMapper.sumTaxAmount(pramsMap); - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("number", "0"); - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 合计信息,仅第一页时需要统计，减少数据库压力 - if (curr == 1) { - String number = "0"; - String taxAmountSum = "0"; - Map data = super.baseMapper.sumTaxAmount(pramsMap); - - number = ObjectUtil.fixNull(data.get("number")); - if (!"0".equals(number)) { - taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("taxAmountSum"))); - } - json.put("taxAmountSum", taxAmountSum); - json.put("number", number); + number = ObjectUtil.fixNull(data.get("number")); + if (!"0".equals(number)) { + taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("taxAmountSum"))); } + json.put("taxAmountSum", taxAmountSum); + json.put("number", number); + } - // 查询发票上的购方信息 - - PageHelper.startPage(curr, size); - List pageList = super.baseMapper.queryCollect(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - DynamicContextHolder.push(DbConstant.BASICS_READ); - List orgList = confirmDao.getTaxno(); - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - int i = 1; - for (CustomsCollectVO vo : resultList) { - vo.setIndex(String.valueOf((curr - 1) * size + i)); - vo.setTaxSum(AmountFormatUtil.fmtMicrometer((vo.getTaxSum()))); - for (TAcOrg org : orgList) { - if (org.getTaxno().equals(vo.getGfTaxNo())) { - vo.setGfName(org.getTaxname()); - } + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = super.baseMapper.queryCollect(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + DynamicContextHolder.push(DbConstant.BASICS_READ); + List orgList = confirmDao.getTaxno(); + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + int i = 1; + for (CustomsCollectVO vo : resultList) { + vo.setIndex(String.valueOf((curr - 1) * size + i)); + vo.setTaxSum(AmountFormatUtil.fmtMicrometer((vo.getTaxSum()))); + for (TAcOrg org : orgList) { + if (org.getTaxno().equals(vo.getGfTaxNo())) { + vo.setGfName(org.getTaxname()); } - i++; } + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -119,7 +109,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); + List gfTaxNoList = (List) pramsMap.get("gfTaxNoList"); if (gfTaxNoList.size() == 0) { // 未从getUserInfo()获取到购方税号信息 @@ -147,7 +137,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.queryInsertCustoms(pramsMap); - log.info("pageList=======>{}",pageList); + log.info("pageList=======>{}", pageList); PageInfo pageInfo = new PageInfo<>(pageList); json.put("hasNext", pageInfo.isHasNextPage()); json.put("nextPage", pageInfo.getNextPage()); @@ -171,13 +161,13 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl{}",json); + log.info("json=====>{}", json); return json; } @@ -186,69 +176,61 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); - - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 合计信息,仅第一页时需要统计，减少数据库压力 - if (curr == 1) { - String number = "0"; - String taxAmountSum = "0"; - pramsMap.put("maunalSign", "1"); - Map data = super.baseMapper.sumTaxAmount(pramsMap); - - if (data != null) { - taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("taxAmountSum"))); - json.put("taxAmountSum", taxAmountSum); - } + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 合计信息,仅第一页时需要统计，减少数据库压力 + if (curr == 1) { + String number = "0"; + String taxAmountSum = "0"; + pramsMap.put("maunalSign", "1"); + Map data = super.baseMapper.sumTaxAmount(pramsMap); + if (data != null) { + taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("taxAmountSum"))); + json.put("taxAmountSum", taxAmountSum); } - // 查询发票上的购方信息 - - PageHelper.startPage(curr, size); - List pageList = super.baseMapper.queryManualSign(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); + } - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - // List jhModels = dictdetaServcice.selectDictdeta("AUDIT_STATUS"); - // List sqhdModels = dictdetaServcice.selectDictdeta("APPLY_CHECK"); - // List hcjgModels = dictdetaServcice.selectDictdeta("CHECK_STATUS"); - // List cjfsModels = dictdetaServcice.selectDictdeta("JKSCJFS"); - // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); - // List bfxModels = dictdetaServcice.selectDictdeta("entryDiscrepancy"); - int i = 1; - for (CustomsCollectVO vo : resultList) { - vo.setIndex(String.valueOf((curr - 1) * size + i)); - if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { - vo.setTaxAmount("0.00"); - } else { - vo.setTaxAmount( + // 查询发票上的购方信息 + + PageHelper.startPage(curr, size); + List pageList = super.baseMapper.queryManualSign(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + // List jhModels = dictdetaServcice.selectDictdeta("AUDIT_STATUS"); + // List sqhdModels = dictdetaServcice.selectDictdeta("APPLY_CHECK"); + // List hcjgModels = dictdetaServcice.selectDictdeta("CHECK_STATUS"); + // List cjfsModels = dictdetaServcice.selectDictdeta("JKSCJFS"); + // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); + // List bfxModels = dictdetaServcice.selectDictdeta("entryDiscrepancy"); + int i = 1; + for (CustomsCollectVO vo : resultList) { + vo.setIndex(String.valueOf((curr - 1) * size + i)); + if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { + vo.setTaxAmount("0.00"); + } else { + vo.setTaxAmount( AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(vo.getTaxAmount())) - .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); - } - // 字典值转换 - vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - vo.setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, vo.getAuditStatus())); - vo.setApplyCheck(dictdetaServcice.queryDictName(DictConstant.APPLY_CHECK, vo.getApplyCheck())); - vo.setCheckStatus(dictdetaServcice.queryDictName(DictConstant.CHECK_STATUS, vo.getCheckStatus())); - vo.setEntryDiscrepancy( - dictdetaServcice.queryDictName(DictConstant.ENTRY_DISCREPANCY, vo.getEntryDiscrepancy())); - i++; + .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); } + // 字典值转换 + vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + vo.setAuditStatus(dictdetaServcice.queryDictName(DictConstant.AUDIT_STATUS, vo.getAuditStatus())); + vo.setApplyCheck(dictdetaServcice.queryDictName(DictConstant.APPLY_CHECK, vo.getApplyCheck())); + vo.setCheckStatus(dictdetaServcice.queryDictName(DictConstant.CHECK_STATUS, vo.getCheckStatus())); + vo.setEntryDiscrepancy( + dictdetaServcice.queryDictName(DictConstant.ENTRY_DISCREPANCY, vo.getEntryDiscrepancy())); + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -257,64 +239,40 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNo"); - - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("number", "0"); - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - - PageHelper.startPage(curr, size); - List pageList = super.baseMapper.queryRzcxByPage(pramsMap); - log.info("pageList={}",pageList.size()); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - // List lyModels = dictdetaServcice.selectDictdeta("jksSources"); - // List qsztModels = dictdetaServcice.selectDictdeta("qsStatus"); - // List qsfsModels = dictdetaServcice.selectDictdeta("qsType"); - // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); - // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); - // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); - // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); - // List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); - int i = 1; - for (CustomsRzcxVO vo : resultList) { - vo.setXh(String.valueOf((curr - 1) * size + i)); - vo.setTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getTaxAmount())); - vo.setYxTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getYxTaxAmount())); - // 字典值转换 - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); - // if (lyModels!=null){ - // for (DictdetaModel model : lyModels){ - // if (model.getDictcode().equals(vo.getDataSources())){ - // vo.setDataSources(model.getDictname()); - // } - // } - // } - vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQsStatus())); - String qsType = vo.getQsType(); - vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType)); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); - vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); - - i++; - } + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + + PageHelper.startPage(curr, size); + List pageList = super.baseMapper.queryRzcxByPage(pramsMap); + log.info("pageList={}", pageList.size()); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + int i = 1; + for (CustomsRzcxVO vo : resultList) { + vo.setXh(String.valueOf((curr - 1) * size + i)); + vo.setTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getTaxAmount())); + vo.setYxTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getYxTaxAmount())); + // 字典值转换 + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); + vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQsStatus())); + String qsType = vo.getQsType(); + vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType)); + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); + vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); + + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -323,53 +281,44 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNo"); - - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("number", "0"); - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - PageHelper.startPage(curr, size); - List pageList = tDxExportInvoiceDao.queryVatRzcx(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - // List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); - // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); - // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); - // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); - // List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); - // List fplxModels = dictdetaServcice.selectDictdeta("INVOICE_TYPE"); - int i = 1; - for (ExportInvoiceRzcxVO vo : resultList) { - vo.setXh(String.valueOf((curr - 1) * size + i)); - // 字典值转换 - vo.setInvoiceType( + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = tDxExportInvoiceDao.queryVatRzcx(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + // List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); + // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); + // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); + // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); + // List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); + // List fplxModels = dictdetaServcice.selectDictdeta("INVOICE_TYPE"); + int i = 1; + for (ExportInvoiceRzcxVO vo : resultList) { + vo.setXh(String.valueOf((curr - 1) * size + i)); + // 字典值转换 + vo.setInvoiceType( dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT, vo.getInvoiceType())); - vo.setInvoiceStatus( + vo.setInvoiceStatus( dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, vo.getInvoiceStatus())); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); - vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); + vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); - vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount())); - vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); - vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse())); + vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount())); + vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); + vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse())); - i++; - } + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -378,62 +327,53 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNo"); - - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("number", "0"); - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - PageHelper.startPage(curr, size); - List pageList = tDxExportCustomsDao.queryCustomsRzcx(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - // List lyModels = dictdetaServcice.selectDictdeta("jksSources"); - // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); - // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); - // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); - // List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); - // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); - int i = 1; - for (ExportCustomsRzcxVO vo : resultList) { - vo.setXh(String.valueOf((curr - 1) * size + i)); - if (vo.getExportTaxAmount() == null || "".equals(vo.getExportTaxAmount())) { - vo.setExportTaxAmount("0.00"); - } else { - vo.setExportTaxAmount( + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = tDxExportCustomsDao.queryCustomsRzcx(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + // List lyModels = dictdetaServcice.selectDictdeta("jksSources"); + // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); + // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); + // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); + // List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); + // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); + int i = 1; + for (ExportCustomsRzcxVO vo : resultList) { + vo.setXh(String.valueOf((curr - 1) * size + i)); + if (vo.getExportTaxAmount() == null || "".equals(vo.getExportTaxAmount())) { + vo.setExportTaxAmount("0.00"); + } else { + vo.setExportTaxAmount( AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(vo.getExportTaxAmount())) - .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); - } - if (vo.getYxExportTaxAmount() == null || "".equals(vo.getYxExportTaxAmount())) { - vo.setYxExportTaxAmount("0.00"); - } else { - vo.setYxExportTaxAmount( + .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); + } + if (vo.getYxExportTaxAmount() == null || "".equals(vo.getYxExportTaxAmount())) { + vo.setYxExportTaxAmount("0.00"); + } else { + vo.setYxExportTaxAmount( AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(vo.getYxExportTaxAmount())) - .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); - } - - // 字典值转换 - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); - vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); - i++; + .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); } + + // 字典值转换 + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setCxrzStatus(dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, vo.getCxrzStatus())); + vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -442,51 +382,43 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); - - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("taxAmountSum", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - PageHelper.startPage(curr, size); - List pageList = super.baseMapper.querySign(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - int i = 1; - for (CustomsCollectVO vo : resultList) { - vo.setIndex(String.valueOf((curr - 1) * size + i)); - // vo.setQsStatus(JQsStatusEnum.getVal(vo.getQsStatus())); - vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_RESULTS, vo.getQsStatus())); - // vo.setQsType(QsTypeEnum.getVal(vo.getQsType())); - vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, vo.getQsType())); - // vo.setDataSources(DataSourceEnum.getVal(vo.getDataSources())); - vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); - // vo.setGlzt(GlztEnum.getVal(vo.getGlzt())); - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { - vo.setTaxAmount("0.00"); - } else { - vo.setTaxAmount( + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = super.baseMapper.querySign(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + int i = 1; + for (CustomsCollectVO vo : resultList) { + vo.setIndex(String.valueOf((curr - 1) * size + i)); + // vo.setQsStatus(JQsStatusEnum.getVal(vo.getQsStatus())); + vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_RESULTS, vo.getQsStatus())); + // vo.setQsType(QsTypeEnum.getVal(vo.getQsType())); + vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, vo.getQsType())); + // vo.setDataSources(DataSourceEnum.getVal(vo.getDataSources())); + vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); + // vo.setGlzt(GlztEnum.getVal(vo.getGlzt())); + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { + vo.setTaxAmount("0.00"); + } else { + vo.setTaxAmount( AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(vo.getTaxAmount())) - .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); - } - vo.setAuditStatus(AuditStatusEnum.getVal(vo.getAuditStatus())); - vo.setApplyCheck(ApplyCheckEnum.getVal(vo.getApplyCheck())); - vo.setCheckStatus(CheckStatusEnum.getVal(vo.getCheckStatus())); - i++; + .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); } + vo.setAuditStatus(AuditStatusEnum.getVal(vo.getAuditStatus())); + vo.setApplyCheck(ApplyCheckEnum.getVal(vo.getApplyCheck())); + vo.setCheckStatus(CheckStatusEnum.getVal(vo.getCheckStatus())); + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; @@ -496,57 +428,51 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); - if (gfTaxNoList.size() == 0) { - json.put("hjse", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - if (curr == 1) { - String taxAmountSum = "0"; - Map data = super.baseMapper.queryCustomsRefundConfirmSum(pramsMap); - if (data != null) { - taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("hjse"))); - } - json.put("hjse", taxAmountSum); + if (curr == 1) { + String taxAmountSum = "0"; + Map data = super.baseMapper.queryCustomsRefundConfirmSum(pramsMap); + if (data != null) { + taxAmountSum = AmountFormatUtil.fmtMicrometer(ObjectUtil.fixNull(data.get("hjse"))); } + json.put("hjse", taxAmountSum); + } - // 查询发票上的购方信息l - PageHelper.startPage(curr, size); - List pageList = super.baseMapper.queryCustomsRefundConfirmList(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - int i = 1; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - for (CustomsRecordVO vo : resultList) { - // 页面展示需要信息 - vo.setXh(String.valueOf((curr - 1) * size + i)); - if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { - vo.setTaxAmount("0.00"); - } else { - vo.setTaxAmount( + // 查询发票上的购方信息l + PageHelper.startPage(curr, size); + List pageList = super.baseMapper.queryCustomsRefundConfirmList(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + int i = 1; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + for (CustomsRecordVO vo : resultList) { + // 页面展示需要信息 + vo.setXh(String.valueOf((curr - 1) * size + i)); + if (vo.getTaxAmount() == null || "".equals(vo.getTaxAmount())) { + vo.setTaxAmount("0.00"); + } else { + vo.setTaxAmount( AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(vo.getTaxAmount())) - .setScale(2, RoundingMode.HALF_UP).toPlainString())); - } - // 字典值转换 - vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQsStatus())); - vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, vo.getQsType())); - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, vo.getRzlx())); - i++; + .setScale(2, RoundingMode.HALF_UP).toPlainString())); } + // 字典值转换 + vo.setQsStatus(dictdetaServcice.queryDictName(DictConstant.QS_STATUS, vo.getQsStatus())); + vo.setQsType(dictdetaServcice.queryDictName(DictConstant.QS_TYPE, vo.getQsType())); + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setRzlx(dictdetaServcice.queryDictName(DictConstant.INVOICE_RZLX, vo.getRzlx())); + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -555,52 +481,43 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("hjsl", "0"); - json.put("hjje", "0"); - json.put("hjse", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - PageHelper.startPage(curr, size); - List pageList = tDxExportInvoiceDao.queryExportInvoiceList(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - // List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); - // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); - // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); - // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); - // List fplxModels = dictdetaServcice.selectDictdeta("INVOICE_TYPE"); - int i = 1; - for (ExportInvoiceRzcxVO vo : resultList) { - vo.setXh(String.valueOf((curr - 1) * size + i)); - - // 字典值转换 - vo.setInvoiceType( + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = tDxExportInvoiceDao.queryExportInvoiceList(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + // List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); + // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); + // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); + // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); + // List fplxModels = dictdetaServcice.selectDictdeta("INVOICE_TYPE"); + int i = 1; + for (ExportInvoiceRzcxVO vo : resultList) { + vo.setXh(String.valueOf((curr - 1) * size + i)); + + // 字典值转换 + vo.setInvoiceType( dictdetaServcice.queryDictName(DictConstant.INVOICE_TYPE_VAT, vo.getInvoiceType())); - vo.setInvoiceStatus( + vo.setInvoiceStatus( dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, vo.getInvoiceStatus())); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); - - vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount())); - vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); - vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse())); - i++; - } + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); + + vo.setExportAmount(AmountFormatUtil.fmtMicrometer(vo.getExportAmount())); + vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); + vo.setExportYxse(AmountFormatUtil.fmtMicrometer(vo.getExportYxse())); + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } @@ -609,50 +526,42 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { JSONObject json = new JSONObject(); - List gfTaxNoList = (List)pramsMap.get("gfTaxNoList"); - if (gfTaxNoList.size() == 0) { - // 未从getUserInfo()获取到购方税号信息 - json.put("hjsl", "0"); - json.put("hjse", "0"); - json.put("total", "0"); - json.put("datalist", new ArrayList()); - } else { - DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); - // 查询发票上的购方信息 - PageHelper.startPage(curr, size); - List pageList = tDxExportCustomsDao.queryExportCustomsList(pramsMap); - PageInfo pageInfo = new PageInfo<>(pageList); - json.put("hasNext", pageInfo.isHasNextPage()); - json.put("nextPage", pageInfo.getNextPage()); - - // 用于页面展示 - List resultList = pageInfo.getList(); - if (resultList != null && resultList.size() > 0) { - List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); - // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); - // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); - // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); - List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); - // List lyModels = dictdetaServcice.selectDictdeta("jksSources"); - // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); - int i = 1; - for (ExportCustomsRzcxVO vo : resultList) { - vo.setXh(String.valueOf((curr - 1) * size + i)); - vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); - vo.setYxExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getYxExportTaxAmount())); - // 字典值转换 - vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); - vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); - vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); - vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); - vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); - - i++; - } + DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); + // 查询发票上的购方信息 + PageHelper.startPage(curr, size); + List pageList = tDxExportCustomsDao.queryExportCustomsList(pramsMap); + PageInfo pageInfo = new PageInfo<>(pageList); + json.put("hasNext", pageInfo.isHasNextPage()); + json.put("nextPage", pageInfo.getNextPage()); + + // 用于页面展示 + List resultList = pageInfo.getList(); + if (resultList != null && resultList.size() > 0) { + List fpztModels = dictdetaServcice.selectDictdeta("INVOICE_STATUS"); + // List rzztModels = dictdetaServcice.selectDictdeta("rzhYesorno"); + // List rzclztModels = dictdetaServcice.selectDictdeta("authStatus"); + // List rzlxModels = dictdetaServcice.selectDictdeta("BDK_STATUS"); + List cxrzModels = dictdetaServcice.selectDictdeta("CXRZ_STATUS"); + // List lyModels = dictdetaServcice.selectDictdeta("jksSources"); + // List glztModels = dictdetaServcice.selectDictdeta("GLZT"); + int i = 1; + for (ExportCustomsRzcxVO vo : resultList) { + vo.setXh(String.valueOf((curr - 1) * size + i)); + vo.setExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getExportTaxAmount())); + vo.setYxExportTaxAmount(AmountFormatUtil.fmtMicrometer(vo.getYxExportTaxAmount())); + // 字典值转换 + vo.setGlzt(dictdetaServcice.queryDictName(DictConstant.GLZT, vo.getGlzt())); + vo.setDataSources(dictdetaServcice.queryDictName(DictConstant.JKSCJFS, vo.getDataSources())); + vo.setRzhYesorno(dictdetaServcice.queryDictName(DictConstant.DEDU_STATUS, vo.getRzhYesorno())); + vo.setAuthStatus(dictdetaServcice.queryDictName(DictConstant.AUTH_STATUS_ALL, vo.getAuthStatus())); + vo.setBdkStatus(dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, vo.getBdkStatus())); + + i++; } - json.put("datalist", resultList); } + json.put("datalist", resultList); + return json; } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java index d13eb281..d551fa01 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsCollectThread.java @@ -123,6 +123,7 @@ public class CustomsCollectThread extends BaseThread { JSONObject prams = JSONObject.parseObject(condition); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String createDateBegin = prams.getString("createDateBegin"); String createDateEnd = prams.getString("createDateEnd"); int ycpbz = prams.getIntValue("ycpbz"); @@ -134,13 +135,13 @@ public class CustomsCollectThread extends BaseThread { pramsMap.put("dbName", dbName); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - pramsMap.put("gfTaxNoList", gfTaxNoList); - } else { - pramsMap.put("gfTaxNoList", gfTaxNoList); + pramsMap.put("gfsh", gfsh); + } + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } + pramsMap.put("createDateBegin", DateUtils.getMorning(DateUtils.strToDate(createDateBegin))); pramsMap.put("createDateEnd", DateUtils.getNight(DateUtils.strToDate(createDateEnd))); if (ycpbz == 1) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java index 36a0c226..74191cea 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsManualSignThread.java @@ -128,6 +128,7 @@ public class CustomsManualSignThread extends BaseThread { JSONObject prams = JSONObject.parseObject(condition); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String createDateBegin = prams.getString("createDateBegin"); String createDateEnd = prams.getString("createDateEnd"); String company = prams.getString("company"); @@ -139,11 +140,12 @@ public class CustomsManualSignThread extends BaseThread { List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - prams.put("gfTaxNoList", gfTaxNoList); - } else { - prams.put("gfTaxNoList", gfTaxNoList); + prams.put("gfsh", gfsh); } + if (!StringHelper.isBlank(companyCode)) { + prams.put("companyCode", companyCode); + } + if (StringUtils.isNotBlank(createDateBegin)) { prams.put("createDateBegin", DateUtils.getMorning(DateUtils.strToDate(createDateBegin))); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java index 090b5e94..4b757dbd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRefundVeriThread.java @@ -130,6 +130,7 @@ public class CustomsRefundVeriThread extends BaseThread { String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String signStatus = prams.getString("signStatus"); String authStatus = prams.getString("authStatus"); String manageStatus = prams.getString("manageStatus"); @@ -137,12 +138,12 @@ public class CustomsRefundVeriThread extends BaseThread { String company = prams.getString("company"); String menuId = prams.getString("menuId"); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - prams.put("gfTaxNoList", gfTaxNoList); - } else { - prams.put("gfTaxNoList", gfTaxNoList); + prams.put("gfsh", gfsh); + } + + if (!StringHelper.isBlank(companyCode)) { + prams.put("companyCode", companyCode); } if ("99".equals(signStatus)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java index 194a4453..f703b0af 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsRzcxExportThread.java @@ -125,6 +125,7 @@ public class CustomsRzcxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String customsCode = prams.getString("customsCode"); String fillInDateStart = prams.getString("fillInDateStart"); String fillInDateEnd = prams.getString("fillInDateEnd"); @@ -157,13 +158,13 @@ public class CustomsRzcxExportThread extends BaseThread { pramsMap.put("dbName", dbName); pramsMap.put("business", businesses); pramsMap.put("confirmUserList",confirmUserList); - List gfTaxNoList = new ArrayList<>(); + if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - pramsMap.put("gfTaxNo", gfTaxNoList); - gfsh = null; - } else { - pramsMap.put("gfTaxNo", gfTaxNoList); + pramsMap.put("gfsh", gfsh); + } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } if ("99".equals(glzt)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java index 1ec1a777..3eade97c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomsSignQueryThread.java @@ -130,6 +130,7 @@ public class CustomsSignQueryThread extends BaseThread { JSONObject prams = JSONObject.parseObject(condition); String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String fillInDateBegin = prams.getString("fillInDateBegin"); String fillInDateEnd = prams.getString("fillInDateEnd"); String qsStatus = prams.getString("qsStatus"); @@ -141,13 +142,14 @@ public class CustomsSignQueryThread extends BaseThread { prams.put("dbName", dbName); prams.put("userAccount", userid); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - prams.put("gfTaxNoList", gfTaxNoList); - } else { - prams.put("gfTaxNoList", gfTaxNoList); + prams.put("gfsh", gfsh); } + + if (!StringHelper.isBlank(companyCode)) { + prams.put("companyCode", companyCode); + } + if (StringUtils.isNotBlank(fillInDateBegin)) { prams.put("fillInDateBegin", DateUtils.getMorning(DateUtils.strToDate(fillInDateBegin))); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java index 24dfa96e..9a3e81e5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsQueryThread.java @@ -131,6 +131,7 @@ public class ExportCustomsQueryThread extends BaseThread { String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String bdkStatus = prams.getString("bdkStatus"); String authStatus = prams.getString("authStatus"); String rzhYesorno = prams.getString("rzhYesorno"); @@ -140,14 +141,13 @@ public class ExportCustomsQueryThread extends BaseThread { String company = prams.getString("company"); String menuId = prams.getString("menuId"); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - prams.put("gfTaxNoList", gfTaxNoList); - } else { - prams.put("gfTaxNoList", gfTaxNoList); + prams.put("gfsh", gfsh); } + if (!StringHelper.isBlank(companyCode)) { + prams.put("companyCode", companyCode); + } if ("99".equals(bdkStatus)) { prams.put("bdkStatus", ""); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java index 89f9152b..13efa0a1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportCustomsRzcxExportThread.java @@ -123,6 +123,7 @@ public class ExportCustomsRzcxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String customsCode = prams.getString("customsCode"); String fillInDateStart = prams.getString("fillInDateStart"); String fillInDateEnd = prams.getString("fillInDateEnd"); @@ -177,6 +178,7 @@ public class ExportCustomsRzcxExportThread extends BaseThread { } pramsMap.put("gfsh", gfsh); + pramsMap.put("companyCode", companyCode); pramsMap.put("customsCode", customsCode); pramsMap.put("fillInDateStart", DateUtils.getMorning(DateUtils.strToDate(fillInDateStart))); pramsMap.put("fillInDateEnd", DateUtils.getNight(DateUtils.strToDate(fillInDateEnd))); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java index fc067875..dc49ad0b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceQueryThread.java @@ -132,6 +132,7 @@ public class ExportInvoiceQueryThread extends BaseThread { String gfTaxNo = prams.getString("gfTaxNo"); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String invoiceType = prams.getString("invoiceType"); String invoiceSource = prams.getString("invoiceSource"); String invoiceStatus = prams.getString("invoiceStatus"); @@ -141,12 +142,12 @@ public class ExportInvoiceQueryThread extends BaseThread { String company = prams.getString("company"); String menuId = prams.getString("menuId"); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - prams.put("gfTaxNoList", gfTaxNoList); - } else { - prams.put("gfTaxNoList", gfTaxNoList); + prams.put("gfsh", gfsh); + } + + if (!StringHelper.isBlank(companyCode)) { + prams.put("companyCode", companyCode); } if ("99".equals(invoiceType)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java index 090bc1c6..26b6da57 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ExportInvoiceRzcxExportThread.java @@ -123,6 +123,7 @@ public class ExportInvoiceRzcxExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String xfName = prams.getString("xfName"); String invoiceDateStart = prams.getString("invoiceDateStart"); String invoiceDateEnd = prams.getString("invoiceDateEnd"); @@ -147,13 +148,12 @@ public class ExportInvoiceRzcxExportThread extends BaseThread { pramsMap.put("dbName", dbName); - List gfTaxNoList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { - gfTaxNoList = StringHelper.stringToList(gfsh); - pramsMap.put("gfTaxNo", gfTaxNoList); - gfsh = null; - } else { - pramsMap.put("gfTaxNo", gfTaxNoList); + pramsMap.put("gfsh", gfsh); + } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } if ("99".equals(invoiceStatus)) { @@ -183,6 +183,7 @@ public class ExportInvoiceRzcxExportThread extends BaseThread { } pramsMap.put("gfsh", gfsh); + pramsMap.put("companyCode", companyCode); pramsMap.put("invoiceDateStart", DateUtils.getMorning(DateUtils.strToDate(invoiceDateStart))); pramsMap.put("invoiceDateEnd", DateUtils.getNight(DateUtils.strToDate(invoiceDateEnd))); pramsMap.put("xfName", xfName); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java index 5a668f9c..2d409035 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpqsExportThread.java @@ -62,7 +62,7 @@ public class FpqsExportThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "签收描述", "签收日期", "签收状态", "签收人", "签收方式", "发票代码", "发票号码", "发票类型", "开票日期", - "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "价税合计", "扫描时间", "备注", "业务单元"}; + "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "价税合计", "扫描时间", "备注", "业务单元","凭证号","过账时间","影像号","账期","报账单号","报账人","入账状态","所属组织"}; private final IExcelExportlogService exportLogService; @@ -116,6 +116,7 @@ public class FpqsExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String businessCode = prams.getString("businessCode"); String qsrqq = prams.getString("qsrqq"); String qsrqz = prams.getString("qsrqz"); @@ -146,6 +147,7 @@ public class FpqsExportThread extends BaseThread { pramsMap.put("gxStatus", gxStatus); pramsMap.put("businessCode", businessCode); pramsMap.put("gfsh", gfsh); + pramsMap.put("companyCode", companyCode); pramsMap.put("gfshFlag", gfshFlag); pramsMap.put("settlementNo", prams.get("settlementNo")); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java index 6b5a4351..1785a06e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/InvoiceOutExportThread.java @@ -135,6 +135,7 @@ public class InvoiceOutExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String xfName = prams.getString("sellerName"); String invoiceNo = prams.getString("invoiceNo"); String reasonId = prams.getString("reasonId"); @@ -156,13 +157,7 @@ public class InvoiceOutExportThread extends BaseThread { filter.put("orderByClause", "out_date desc"); // 购方税号 - List allTaxNo = new ArrayList<>(); - if (!StringHelper.isBlank(gfsh)) { - allTaxNo = StringHelper.stringToList(gfsh); - } else { - allTaxNo.add(gfsh); - } - filter.put("gfshList", allTaxNo); + filter.put("gfshList", gfsh); // 销方名称 filter.put("sellerName", StringHelper.isBlank(xfName) ? null : xfName); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java index b0ee510f..1649697b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QssbExportThread.java @@ -112,6 +112,7 @@ public class QssbExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String xfmc = prams.getString("xfmc"); String fphm = prams.getString("fphm"); String qsrqq = prams.getString("qsrqq"); @@ -123,13 +124,14 @@ public class QssbExportThread extends BaseThread { // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); - 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); } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); + } + pramsMap.put("xfmc", xfmc); pramsMap.put("qsr", qsr); pramsMap.put("fphm", fphm); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java index df54e276..62fa5315 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QstjbExportThread.java @@ -112,6 +112,7 @@ public class QstjbExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String qszt = prams.getString("qszt"); String qsfs = prams.getString("qsfs"); String xfmc = prams.getString("xfmc"); @@ -131,11 +132,13 @@ public class QstjbExportThread extends BaseThread { pramsMap.put("businessCode", prams.getString("businessCode")); 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); } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); + } + if (!"99".equals(qszt)) { pramsMap.put("qszt", qszt); } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java index 092d2b0c..2869d4ee 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzjgqdExportThread.java @@ -110,6 +110,7 @@ public class RzjgqdExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String skssq = prams.getString("skssq"); String company = prams.getString("company"); String dklx = prams.getString("dklx"); @@ -119,11 +120,13 @@ public class RzjgqdExportThread extends BaseThread { pramsMap.put("userid", userid); 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); } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); + } + pramsMap.put("skssq", skssq); pramsMap.put("company", company); pramsMap.put("dklx", dklx); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java index a6f6a5bc..7b013cdc 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/SgqsExportThread.java @@ -111,6 +111,7 @@ public class SgqsExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String businessCode = prams.getString("businessCode"); String kprqq = prams.getString("kprqq"); String kprqz = prams.getString("kprqz"); @@ -126,10 +127,10 @@ public class SgqsExportThread extends BaseThread { pramsMap.put("dbName", dbName); 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); + } + if (!StringHelper.isBlank(gfsh)) { + pramsMap.put("companyCode", companyCode); } if (!StringHelper.isBlank(businessCode) && !"99".equals(businessCode)) { diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java index 9b3693d7..34b169e9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/TaxRebateAuthenticationThread.java @@ -112,6 +112,7 @@ public class TaxRebateAuthenticationThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String company = prams.getString("company"); String menuId = prams.getString("menuId"); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); @@ -135,8 +136,8 @@ public class TaxRebateAuthenticationThread extends BaseThread { pramsMap.put("authenticationDetailStatus", prams.getString("authenticationDetailStatus")); pramsMap.put("authenticationPeople", prams.getString("authenticationPeople")); pramsMap.put("currentPeriod", prams.getString("currentPeriod")); - pramsMap.put("buyerTaxNo", - "99".equals(prams.getString("buyerTaxNo")) ? gfsh : prams.getString("buyerTaxNo")); + pramsMap.put("buyerTaxNo",gfsh); + pramsMap.put("companyCode",companyCode); pramsMap.put("company", prams.getString("company")); pramsMap.put("authenticationEndTime", prams.getString("authenticationEndTime")); pramsMap.put("authenticationStartTime", prams.getString("authenticationStartTime")); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java index bde9b9d0..b36e2ed1 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/YqswrzExportThread.java @@ -112,6 +112,7 @@ public class YqswrzExportThread extends BaseThread { // 应该保存的参数 JSONObject prams = JSONObject.parseObject(condition); String gfsh = prams.getString("gfsh"); + String companyCode = prams.getString("companyCode"); String qsfs = prams.getString("qsfs"); String xfmc = prams.getString("xfmc"); String fphm = prams.getString("fphm"); @@ -128,12 +129,12 @@ public class YqswrzExportThread extends BaseThread { pramsMap.put("userid", userid); pramsMap.put("business", businesses); pramsMap.put("businessCode", prams.getString("businessCode")); - 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); + } + + if (!StringHelper.isBlank(companyCode)) { + pramsMap.put("companyCode", companyCode); } if (!"99".equals(qsfs)) { pramsMap.put("qsfs", qsfs); diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index d85bf11b..67ee217a 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -384,6 +384,9 @@ #{item} + + and t.comp_code = #{companyCode} + and t.invoice_no = #{invoiceNo} diff --git a/dxhy-core/src/main/resources/mapper/QssbMapper.xml b/dxhy-core/src/main/resources/mapper/QssbMapper.xml index 974153e5..2bcce79e 100644 --- a/dxhy-core/src/main/resources/mapper/QssbMapper.xml +++ b/dxhy-core/src/main/resources/mapper/QssbMapper.xml @@ -33,11 +33,10 @@ from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid where t.qs_status = '0' and t.qs_date between #{qsrqq} and #{qsrqz} - and t.gf_tax_no in - - #{item} - - + and t.gf_tax_no = #{gfsh} + + and t.comp_code = #{companyCode} + and t.xf_name like CONCAT(#{xfmc},'%') diff --git a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml index d79ddde3..f72bda69 100644 --- a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml +++ b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml @@ -33,11 +33,10 @@ where t.qs_date between #{qsrqq} and #{qsrqz} and t.valid = '1' - and t.gf_tax_no in - - #{item} - - + and t.gf_tax_no = #{gfsh} + + and t.comp_code = #{companyCode} + and t.qs_status = #{qszt} @@ -147,11 +146,10 @@ and t.rzh_yesorno = '0' and t.invoice_type in ('01','03','08','14') and t.qs_date between #{qsrqq} and #{qsrqz} - and t.gf_tax_no in - - #{item} - - + and t.gf_tax_no = #{gfsh} + + and t.comp_code = #{companyCode} + and t.qs_type = #{qsfs} diff --git a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml index 1b8192bd..aa761cd0 100644 --- a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml @@ -29,8 +29,9 @@ resultMap="BaseResultMap" databaseId="mysql"> SELECT t.id,t.notes,t.qs_type,t.gf_name,t.xf_name,t.qs_status,t.qs_date,t.user_name,t.invoice_code,t.invoice_no - ,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number - FROM t_dx_invoice t + ,t.ele_invoice_no,t.invoice_type,t.uuid,t.invoice_date,t.invoice_amount,t.tax_amount,t.dept_id,t.dept_name + ,t.scan_id,t.remark,t.gf_tax_no,t.xf_tax_no,t.create_date,t.total_amount,t.voucher_number,r.sn_voucher_number,r.posting_time,r.image_id,r.account_period,r.bzdh,bzr,r.inaccount_status,r.comp_code + from t_dx_invoice t inner join t_dx_record_invoice r on t.uuid = r.uuid WHERE t.valid = '1' and t.user_account = #{userid} diff --git a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml index c429bbf3..a27326f0 100644 --- a/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml +++ b/dxhy-core/src/main/resources/mapper/RzjgqdMapper.xml @@ -34,10 +34,8 @@ t.comp_code as compCode from t_dx_record_invoice t where t.invoice_type in ('01','03','08','14','31') and t.auth_status = '4' - and t.gf_tax_no in - - #{item} - + and t.gf_tax_no = #{gfsh} + and t.comp_code = #{companyCode} and t.rzh_belong_date = #{skssq} diff --git a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml index 59ba5187..e885cafb 100644 --- a/dxhy-core/src/main/resources/mapper/SgqsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/SgqsMapper.xml @@ -28,11 +28,10 @@ from t_dx_record_invoice t where qs_status = '0' and source_system='0' - and - t.gf_tax_no in - - #{item} - + and t.gf_tax_no = #{gfsh} + + and comp_code = #{companyCode} + and invoice_type = #{invoiceType} diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml index a90259be..4181b9a0 100644 --- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml @@ -859,11 +859,11 @@ where t.qs_status = '0' and t.export_mark = '0' and (t.data_sources = '0' or (t.data_sources != '0' and t.collect_upload_status = '2')) - - and t.gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and t.gf_tax_no = #{gfsh} + + + and t.comp_code = #{companyCode} and t.gf_tax_no = #{queryParams.gfTaxNo} @@ -1033,15 +1033,11 @@ FROM t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code where t.user_account = #{queryParams.userAccount} - - and t.gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and t.gf_tax_no =#{gfsh} - - - and t.gf_tax_no = #{queryParams.gfTaxNo} + + and t.comp_code =#{companyCode} @@ -1092,14 +1088,14 @@ SELECT t.id, t.notes, - date_format(t.qs_date,'%Y-%m-%d') AS qsDate, + to_char(t.qs_date,'yyyy-MM-dd') AS qsDate, t.qs_status AS qsStatus, t.user_name AS userName, t.qs_type AS qsType, t.xxly, t.glzt, t.customs_code AS customsCode, - date_format(t.fill_in_date,'%Y-%m-%d') AS fillInDate, + to_char(t.fill_in_date,'yyyy-MM-dd') AS fillInDate, t.gf_tax_no AS gfTaxNo, t.gf_name AS gfName, t.tax_amount AS taxAmount, @@ -1110,31 +1106,37 @@ t.scan_id AS scanId, t.data_sources as dataSources, t.dept_name as deptName + r.sn_voucher_number as snVoucherNumber, + r.posting_time as postingTime, + r.image_id as imageId, + r.account_period as account_period, + r.bzdh, + r.bzr, + r.inaccount_status as inaccountStatus, + r.comp_code as compCode FROM - t_dx_customs t + t_dx_customs t inner join t_dx_customs_record r on t.customs_code = r.customs_code where t.user_account = #{queryParams.userAccount} - - and t.gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and t.gf_tax_no =#{gfsh} - - - and t.gf_tax_no = #{queryParams.gfTaxNo} + + and t.comp_code =#{companyCode} - and t.qs_date >= #{queryParams.qsDateBegin} + and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') >= #{queryParams.qsDateBegin} - and t.qs_date <= CONCAT(substring(#{queryParams.qsDateEnd},1,10),' 23:59:59') + and to_char(t.qs_date,'yyyy-MM-dd hh24:mi:ss') <= CONCAT(substr(#{queryParams.qsDateEnd},1,10),' + 23:59:59') - and t.fill_in_date >= #{queryParams.fillInDateBegin} + and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') >= #{queryParams.fillInDateBegin} - and t.fill_in_date <= CONCAT(substring(#{queryParams.fillInDateEnd},1,10),' 23:59:59') + and to_char(t.fill_in_date,'yyyy-MM-dd hh24:mi:ss') <= CONCAT(substr(#{queryParams.fillInDateEnd},1,10),' + 23:59:59') and t.customs_code = #{queryParams.customsCode} @@ -1212,11 +1214,12 @@ auth_status != '0' and (rzlx = '2' or rzlx = '3') - - and gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and gf_tax_no = #{gfsh} + + + + and comp_code = #{companyCode} and customs_code = #{queryParams.customsCode} diff --git a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml index 04b26d2b..826870fb 100644 --- a/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml +++ b/dxhy-core/src/main/resources/mapper/TDxExportCustomsDao.xml @@ -184,17 +184,14 @@ t_dx_export_customs p where p.auth_status !='0' - - and p.gf_tax_no in - - #{item,jdbcType=VARCHAR} - - - and p.gf_tax_no = #{queryParams.gfsh} + + and p.comp_code = #{queryParams.companyCode} + + and p.customs_code = #{queryParams.customsCode} @@ -423,11 +420,11 @@ - - and p.gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and p.gf_tax_no = #{gfsh} + + + and p.comp_code = #{companyCode} and p.customs_code = #{queryParams.customsCode} diff --git a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml index 21d6998b..935f7cfe 100644 --- a/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml +++ b/dxhy-core/src/main/resources/mapper/TDxExportInvoiceDao.xml @@ -98,6 +98,10 @@ and p.gf_tax_no = #{queryParams.gfsh} + + and p.comp_code = #{queryParams.companyCode} + + and p.rzh_yesorno = #{queryParams.rzhYesorno} @@ -421,11 +425,11 @@ - - and p.gf_tax_no in - - #{item,jdbcType=VARCHAR} - + + and p.gf_tax_no = #{gfsh} + + + and p.comp_code = #{companyCode} and p.rzh_yesorno = #{queryParams.rzhYesorno}