From c8533a9816d87b64b5904bdc189302d5dbb1aefe Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 31 Aug 2023 17:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/entity/TDxInvoice.java | 1 - .../com/dxhy/core/model/CustomsCollectVO.java | 4 ++-- .../java/com/dxhy/core/model/QstjbRespVO.java | 4 ++-- .../java/com/dxhy/core/model/SignQueryVO.java | 1 - .../impl/CustomsCollectServiceImpl.java | 5 +++++ .../service/export/impl/QstjbServiceImpl.java | 11 +++++++--- .../src/main/resources/mapper/QstjbMapper.xml | 22 +++++++++---------- .../mapper/TDxCustomsRecordMapper.xml | 21 +++++++++++------- 8 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java index d20f44db..1c84da45 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/entity/TDxInvoice.java @@ -192,7 +192,6 @@ public class TDxInvoice implements Serializable { private String imageId; private String accountPeriod; private String compCode; - private String inaccountStatus; private String bzdh; private String bzr; private String inAccountStatus; diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java index d41e3712..ae4cb04e 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsCollectVO.java @@ -39,10 +39,10 @@ public class CustomsCollectVO { private String snVoucherNumber; private String postingTime; - private String imageId; + private String imageNumber; private String accountPeriod; private String compCode; - private String inaccountStatus; + private String inAccountStatus; private String bzdh; private String bzr; diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java index c36e3818..e6b68e2a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/QstjbRespVO.java @@ -107,10 +107,10 @@ public class QstjbRespVO implements Serializable { private String snVoucherNumber; private String postingTime; - private String imageId; + private String imageNumber; private String accountPeriod; private String compCode; - private String inaccountStatus; + private String inAccountStatus; private String bzdh; private String bzr; diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java index 0d07bf37..4f8697a0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/SignQueryVO.java @@ -43,7 +43,6 @@ public class SignQueryVO { private String imageId; private String accountPeriod; private String compCode; - private String inaccountStatus; private String bzdh; private String bzr; private String inAccountStatus; 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 4b1ee5fd..d9f89da9 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 @@ -226,6 +226,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl i if (resultList.get(i).getSe() != null && !"".equals(resultList.get(i).getSe())) { resultList.get(i).setSe(MathUtil.round(resultList.get(i).getSe())); } - if ("1".equals(resultList.get(i).getInaccountStatus())){ - resultList.get(i).setInaccountStatus("已入账"); + if ("1".equals(resultList.get(i).getInAccountStatus())){ + resultList.get(i).setInAccountStatus("已入账"); }else { - resultList.get(i).setInaccountStatus("未入账"); + resultList.get(i).setInAccountStatus("未入账"); } } } @@ -105,6 +105,11 @@ public class QstjbServiceImpl extends MpBaseServiceImpl i resultList.get(i).setJe(AmountFormatUtil.fmtMicrometer(resultList.get(i).getJe())); resultList.get(i).setSe(AmountFormatUtil.fmtMicrometer(resultList.get(i).getSe())); + if ("1".equals(resultList.get(i).getInAccountStatus())){ + resultList.get(i).setInAccountStatus("已入账"); + }else { + resultList.get(i).setInAccountStatus("未入账"); + } } } diff --git a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml index d3f2cf5b..f66e6e16 100644 --- a/dxhy-core/src/main/resources/mapper/QstjbMapper.xml +++ b/dxhy-core/src/main/resources/mapper/QstjbMapper.xml @@ -20,10 +20,10 @@ - + - + @@ -141,23 +141,23 @@ select t.id id,t.uuid uuid,date_format(t.qs_date,'%Y-%m-%d') qsrq,t.qs_status qszt,t.qs_type qsfs,t.qs_name qsr, t.invoice_code fpdm,t.invoice_no fphm,t.invoice_type invoiceType,date_format(t.invoice_date,'%Y-%m-%d') kprq,t.gf_tax_no gfsh,t.gf_name gfmc, - t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName,t.sn_voucher_number as snVoucherNumber, + t.xf_tax_no xfsh,t.xf_name xfmc,t.invoice_amount je,t.tax_amount se,t.dept_name deptName,t.sn_voucher_number, t.posting_time as postingTime, - t.image_id as imageId, - t.account_period as account_period, + t.image_id, + t.account_period, t.bzdh, t.bzr, - t.inaccount_status as inaccountStatus, - t.comp_code as compCode + t.inaccount_status, + t.comp_code from t_dx_record_invoice t where t.qs_status = '1' and t.rzh_yesorno = '0' - and t.invoice_type in ('01','03','08','14') + and t.invoice_type in ('01','03','08','14','31') and t.qs_date between #{qsrqq} and #{qsrqz} and t.gf_tax_no = #{gfsh} - - and t.comp_code = #{companyCode} - + + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + and t.qs_type = #{qsfs} diff --git a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml index 6c0be7ae..4ef09625 100644 --- a/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TDxCustomsRecordMapper.xml @@ -906,20 +906,25 @@ t.audit_status as auditStatus, t.apply_check as applyCheck, t.check_status as checkStatus, - t.entry_discrepancy as entryDiscrepancy + t.entry_discrepancy as entryDiscrepancy, + t.sn_voucher_number as snVoucherNumber, + t.posting_time as postingTime, + t.image_id as imageNumber, + t.account_period as account_period, + t.bzdh, + t.bzr, + t.inaccount_status as inAccountStatus, + t.comp_code as compCode FROM t_dx_customs_record t 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.gf_tax_no = #{queryParams.gfTaxNo} + + and t.comp_code = #{companyCode} and t.fill_in_date >= #{queryParams.fillInDateBegin}