From 55bcf5ebd3af26f32c466990922989f3520ccfd8 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 29 Aug 2023 09:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/model/CustomsRecordVO.java | 2 +- .../export/impl/CustomsCollectServiceImpl.java | 5 +++++ .../src/main/resources/mapper/ExtPaperMapper.xml | 1 + .../main/resources/mapper/TDxCustomsRecordMapper.xml | 2 +- .../java/com/dxhy/extend/entity/JkszhcxRespVO.java | 1 + .../extend/service/customs/CustomsServiceImpl.java | 11 ++++++----- .../src/main/resources/mapper/CustomsMapper.xml | 6 ++++-- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java index bf7c14fa..a2ccf951 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/CustomsRecordVO.java @@ -43,7 +43,7 @@ public class CustomsRecordVO { private String imageId; 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/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java index 83ca3659..66e115ab 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 @@ -468,6 +468,11 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ); // 表头 - String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", "稽核结果", "是否申请核对", - "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", - "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", "过账时间","报账单号", "影像号", "账期","所属组织"}; + String[] titlelist = {"序号", "缴款书号码", "管理状态", "填发日期", "缴款单位名称", "缴款单位税号", "税款金额", "抵扣税款金额", + "稽核结果", "是否申请核对", "核对结果", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", + "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "业务单元", "入池时间", + "过账时间","报账单号","报账人", "影像号", "账期","所属组织"}; String[] titleprop = {"xh", "customsCode", "glzt", "fillInDate", "gfName", "gfTaxNo", "taxAmount", "yxTaxAmount", "auditStatus", "applyCheck", "checkStatus", "rzhYesorno", "bdkStatus", "rzhDate", "rzhType", "confirmUser", "cjzt", "createDate", "dataSources", "qsType", "qsStatus", "qsDate", "qsUser", - "inAccountDate", "inAccountStatus", "snVoucherNumber", "businessName", "createDate", "postingTime","bzdh","imageId", - "accountPeriod","compCode"}; + "inAccountDate", "inAccountStatus", "snVoucherNumber", "businessName", "createDate", "postingTime", + "bzdh","bzr","imageId","accountPeriod","compCode"}; // 需要设置返回列表标题时调用 JSONObject json = super.setTitleList(titlelist, titleprop); try { diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index 74d31007..a9738f64 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -34,6 +34,7 @@ + @@ -48,8 +49,9 @@ fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status, DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt, - t.customs_scan_id,t.dept_name businessName,t.inaccount_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date, - data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh + t.customs_scan_id,t.dept_name businessName,t.inaccount_status,t.sn_voucher_number,t.document_number, + t.in_account_date,rzh_type,rzlx,t.create_date, + data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh,t.bzr from t_dx_customs_record t where export_mark = '0' and t.gf_tax_no = #{gfsh}