From d1790e8310eb78d7947079e11f9e906ccce185cb Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Sun, 23 Apr 2023 21:11:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/TdxCustomsRecordModelDTO.java | 3 +++ .../resources/mapper/CustomsRecordMapper.xml | 18 ++++++++++++++++- .../model/dto/TdxExportCustomsModelDTO.java | 2 ++ .../mapper/DomesticExportCustomsMapper.xml | 20 ++++++++++++++++++- .../controller/ExtFpzhcxController.java | 2 ++ .../dxhy/extend/model/ExtBbfpzhcxRespVO.java | 3 ++- .../dxhy/extend/model/ExtBbycfpcxRespVO.java | 2 ++ .../service/bb/impl/ExtFpzhcxServiceImpl.java | 4 ++-- .../main/resources/mapper/ExtBbfpzhMapper.xml | 16 ++++++++++++++- .../resources/mapper/ExtBbycfpcxMapper.xml | 16 ++++++++++++++- 10 files changed, 79 insertions(+), 7 deletions(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java b/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java index 0df3a4d3..3eae2041 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java @@ -65,6 +65,9 @@ public class TdxCustomsRecordModelDTO extends CommonDTO { private String bdkMessage; private List business; + private String bzdh; + private String inAccountStatus; + public void setParam(Page page, UserInfo userInfo) throws Exception { business = userInfo.getBusiness(); if ("99".equals(gfsh) || "".equals(gfsh)) { diff --git a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml index 5ca38165..7a84960c 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml @@ -254,7 +254,9 @@ p.export_mark as exportMark, p.auth_status as authStatus, p.check_status as checkStatus, - p.dept_name as businessName + p.dept_name as businessName, + p.inaccount_status as inAccountStatus, + p.bzdh FROM t_dx_customs_record p where @@ -275,6 +277,13 @@ and p.gf_tax_no = #{queryParams.gfsh} + + and p.bzdh = #{bzdh} + + + and p.inaccount_status = #{inAccountStatus} + + and p.customs_code = #{queryParams.customsCode} @@ -360,6 +369,13 @@ and p.gf_tax_no = #{queryParams.gfsh} + + and p.bzdh = #{bzdh} + + + and p.inaccount_status = #{inAccountStatus} + + and p.customs_code = #{queryParams.customsCode} diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java index 452b2b91..337a3f0e 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/TdxExportCustomsModelDTO.java @@ -49,6 +49,8 @@ public class TdxExportCustomsModelDTO extends CommonDTO { private String rzhType; private String cxrzType; private String entryDiscrepancy; + private String bzdh; + private String inAccountStatus; public void setParam(Page page, UserInfo userInfo) throws Exception { diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml index 75108884..50f37f6b 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportCustomsMapper.xml @@ -318,6 +318,14 @@ + + and p.bzdh = #{bzdh} + + + + and p.inaccount_status = #{inAccountStatus} + + and p.gf_tax_no = #{queryParams.gfsh} @@ -399,7 +407,9 @@ p.confirm_user as confirmUser, p.rzh_belong_date as rzhBelongDate, p.cxrz_status as cxrzStatus, - p.cxbdk_status as cxbdkStatus + p.cxbdk_status as cxbdkStatus, + p.bzdh as bzdh, + p.inaccount_status as inAccountStatus FROM t_dx_export_customs p where @@ -412,6 +422,14 @@ + + and p.bzdh = #{bzdh} + + + + and p.inaccount_status = #{inAccountStatus} + + and p.gf_tax_no = #{queryParams.gfsh} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java index d4c099fb..7e9d23e9 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java @@ -214,6 +214,8 @@ public class ExtFpzhcxController extends AbstractController { Map data = new HashMap<>(16); data.put("dbName", getUserInfo().getDbName()); data.put("business", getUserInfo().getBusiness()); + data.put("bzdh",pramsMap.get("bzdh")); + data.put("inaccountStatus",pramsMap.get("inaccountStatus")); List gfshList = new ArrayList<>(); if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { gfshList.add(pramsMap.get("gfsh").toString()); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java index 58540cfc..1e890e27 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java @@ -152,7 +152,7 @@ public class ExtBbfpzhcxRespVO implements Serializable { */ private String exportMark; private String scanId; - private String inAccountStatus; + private String inaccountStatus; /** * 结算单号 @@ -185,6 +185,7 @@ public class ExtBbfpzhcxRespVO implements Serializable { private String imageId; private String accountPeriod; private String compCode; + private String bzdh; public ExtBbfpzhcxRespVO() {} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java index 3182ddec..0945c30f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbycfpcxRespVO.java @@ -108,6 +108,8 @@ public class ExtBbycfpcxRespVO implements Serializable { private String skssq; private String businessName; + private String inaccountStatus; + private String bzdh; public ExtBbycfpcxRespVO() {} diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java index 5453d21e..b9b6639f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java @@ -122,9 +122,9 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl + + @@ -63,7 +65,7 @@ dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno, t.invoice_type , t.dept_name deptName,t.glzt glzt,t.uuid,t.bdk_status,t.scan_id,t.in_account_status,t.settle_source, - t.settlement_no, + t.settlement_no,t.in_account_status,t.bzdh, t.settlement_status,t.voucher_number,t.total_amount,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period from t_dx_record_invoice t WHERE t.company = #{company} and t.invoice_date between #{kpksrq} and #{kpjsrq} @@ -71,6 +73,12 @@ #{item} + + and t.bzdh = #{bzdh} + + + and t.in_account_status = #{inaccountStatus} + and t.invoice_status = #{invoiceStatus} @@ -324,6 +332,12 @@ test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' and invoiceStatus != '99'"> and t.invoice_status = #{invoiceStatus} + + and t.bzdh = #{bzdh} + + + and t.in_account_status = #{inaccountStatus} + and t.qs_status = #{qszt} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 6880a98d..fc347227 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -5,6 +5,8 @@ + + @@ -41,7 +43,7 @@ t.invoice_code fpdm, t.invoice_no fphm ,DATE_FORMAT(t.invoice_date,'%Y-%m-%d') kprq,t.gf_tax_no gfsh,t.gf_name gfmc,t.invoice_type invoiceType, t.xf_tax_no xfsh,t.xf_name xfmc,t.tax_amount se,t.invoice_amount - je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq, + je,DATE_FORMAT(t.qs_date,'%Y-%m-%d') qsrq,t.inaccount_status,t.bzdh, t.qs_status qszt,t.qs_name qsr, t.invoice_status yczt,DATE_FORMAT(t.status_update_date,'%Y-%m-%d') ycsj,rzh_date rzsj, @@ -55,6 +57,12 @@ #{item} + + and t.bzdh = #{bzdh} + + + and t.inaccount_status = #{inaccountStatus} + and t.invoice_status = #{yczt} @@ -156,6 +164,12 @@ #{item} + + and t.bzdh = #{bzdh} + + + and t.inaccount_status = #{inaccountStatus} + and t.invoice_status = #{yczt}