From c04d13ca44100e6f4cfaf36baab6efc393a54333 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 20:08:23 +0800 Subject: [PATCH 1/5] =?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 --- .../service/pool/ExtInvoicePoolServiceImpl.java | 5 +++-- .../resources/mapper/ExtInvoicePoolMapper.xml | 16 ++++++++++++++++ .../sign/service/fpqs/impl/FpqsServiceImpl.java | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 504f3c9f..cb5ac891 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -285,12 +285,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl ,t.incentive_flag incentiveFlag ,t.system_name systemName + ,t.sn_voucher_no snVoucherNo + ,t.image_id imageId + ,t.account_period accountPeriod + ,t.posting_time postingTime from t_dx_sale_record_invoice t where 1 = 1 @@ -507,6 +511,18 @@ and t.invoice_source = #{invoiceSource} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.posting_time = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + GROUP BY t.uuid ORDER BY t.create_date DESC diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java index 3060ad40..50a040d4 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java @@ -308,6 +308,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl 0) { for (SignRulesEntity signRulesEntity : rules) { if ("1008".contains(signRulesEntity.getRuleCode())) { From d0afa31d90053a75c68cce44dd19dd239671a71e Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 22:10:37 +0800 Subject: [PATCH 2/5] =?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 --- dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index e17bc613..db34a66e 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -450,7 +450,7 @@ ,t.incentive_flag incentiveFlag ,t.system_name systemName - ,t.sn_voucher_no snVoucherNo + ,t.sn_voucher_number snVoucherNumber ,t.image_id imageId ,t.account_period accountPeriod ,t.posting_time postingTime From 870a935903b68083d654511e62a25a1c66154f50 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 24 Apr 2023 22:25:03 +0800 Subject: [PATCH 3/5] =?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 --- .../java/com/dxhy/extend/entity/ExtAddTaxInvoice.java | 2 +- .../extend/service/pool/ExtInvoicePoolServiceImpl.java | 2 +- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index 44ee1da8..0d4d94a7 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -133,7 +133,7 @@ public class ExtAddTaxInvoice implements Serializable { private String collectDate; private String collectFrom; - private String snVoucherNumber; + private String voucherNumber; private String postingTime; private String imageId; private String accountPeriod; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index cb5ac891..ee251aa9 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -290,7 +290,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl and t.invoice_source = #{invoiceSource} - - and t.sn_voucher_number = #{snVoucherNumber} + + and t.voucher_number = #{voucherNumber} and t.posting_time = #{postingTime} @@ -450,7 +450,7 @@ ,t.incentive_flag incentiveFlag ,t.system_name systemName - ,t.sn_voucher_number snVoucherNumber + ,t.voucher_no voucherNumber ,t.image_id imageId ,t.account_period accountPeriod ,t.posting_time postingTime @@ -511,8 +511,8 @@ and t.invoice_source = #{invoiceSource} - - and t.sn_voucher_number = #{snVoucherNumber} + + and t.voucher_no = #{voucherNo} and t.posting_time = #{postingTime} From 27a5198a0947e244cccd990e94b87d31f095e662 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 25 Apr 2023 10:13:24 +0800 Subject: [PATCH 4/5] =?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 --- .../com/dxhy/extend/entity/ExtAddTaxInvoice.java | 4 ++-- .../service/pool/ExtInvoicePoolServiceImpl.java | 2 +- .../resources/mapper/ExtInvoicePoolMapper.xml | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index 0d4d94a7..2ff8e0db 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -133,9 +133,9 @@ public class ExtAddTaxInvoice implements Serializable { private String collectDate; private String collectFrom; - private String voucherNumber; + private String snVoucherNumber; private String postingTime; - private String imageId; + private String imageNumber; private String accountPeriod; private String compCode; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index ee251aa9..fdf47a99 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -290,7 +290,7 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl and t.invoice_source = #{invoiceSource} - - and t.voucher_number = #{voucherNumber} + + and t.sn_voucher_number = #{snVoucherNumber} and t.posting_time = #{postingTime} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} @@ -450,8 +450,8 @@ ,t.incentive_flag incentiveFlag ,t.system_name systemName - ,t.voucher_no voucherNumber - ,t.image_id imageId + ,t.sn_voucher_number snVoucherNumber + ,t.image_id imageNumber ,t.account_period accountPeriod ,t.posting_time postingTime from t_dx_sale_record_invoice t @@ -517,8 +517,8 @@ and t.posting_time = #{postingTime} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} From a21f37e68296fcdb5a9b3a04fa074b8b338ec5ef Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 25 Apr 2023 11:27:44 +0800 Subject: [PATCH 5/5] =?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 --- .../controller/BaseInvoiceController.java | 6 +- .../base/entity/BaseTDxRecordInvoice.java | 2 +- .../com/dxhy/base/model/BaseSggxCxRespVO.java | 2 +- .../BaseInvoiceManualCheckServiceImpl.java | 2 +- .../main/resources/mapper/BaseFpZhMapper.xml | 17 +++- .../resources/mapper/BaseSggxcxMapper.xml | 6 +- .../model/TdxCustomsRecordModelDTO.java | 10 +- .../impl/CustomsRecordDkrzServiceImpl.java | 17 +++- .../resources/mapper/CustomsRecordMapper.xml | 92 ++++++++++++++++--- .../controller/ExtFpzhcxController.java | 5 +- .../dxhy/extend/model/ExtBbfpzhcxRespVO.java | 4 +- .../main/resources/mapper/ExtBbfpzhMapper.xml | 10 +- 12 files changed, 137 insertions(+), 36 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 572eb3bd..5551f9e4 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -284,11 +284,11 @@ public class BaseInvoiceController extends AbstractController { return ResponseEntity.ok(R.error("开票结束日期不能为空！")); } if (StringUtils.isNotBlank(inAccountStatus)) { - pramsMap.put("inaccountStatus", inAccountStatus); + pramsMap.put("inAccountStatus", inAccountStatus); } if(pramsMap.get("imageNumber") != null){ - pramsMap.put("imageId",pramsMap.get("imageNumber")); + pramsMap.put("imageNumber",pramsMap.get("imageNumber")); } if(pramsMap.get("snVoucherNumber") != null){ @@ -468,7 +468,7 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); pramsMap.put("postingTimeStart", map.get("postingTimeStart")); - pramsMap.put("imageId", map.get("imageNumber")); + pramsMap.put("imageNumber", map.get("imageNumber")); if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { String accountPeriod = map.get("accountPeriod").toString().substring(0,7); pramsMap.put("accountPeriod", accountPeriod); diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index c6025ba9..f75e45f8 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -508,7 +508,7 @@ public class BaseTDxRecordInvoice implements Serializable { //过账时间 private String postingTime; //影像号 - private String imageId; + private String imageNumber; //报账单号 private String bzdh; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index a9f770a5..ddb422ee 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -132,7 +132,7 @@ public class BaseSggxCxRespVO { /** * 影像id */ - private String imageId; + private String imageNumber; /** * 凭证号 diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 5d30c3ef..c2a73800 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -170,7 +170,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl + @@ -198,8 +199,8 @@ and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} @@ -336,6 +337,18 @@ test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' "> and t.invoice_status = #{invoiceStatus} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + + + and t.image_id = #{imageNumber} + + + and t.account_period = #{accountPeriod} + and t.voucher_number like concat('%',concat(#{voucherNumber},'%')) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 5a17c13b..bbbc7a11 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -26,6 +26,8 @@ + + @@ -167,8 +169,8 @@ and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} 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 551e9b37..d7b71804 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 @@ -66,7 +66,15 @@ public class TdxCustomsRecordModelDTO extends CommonDTO { private List business; private String bzdh; - private String inaccountStatus; + private String inAccountStatus; + + private String snVoucharNumber; + private String imageNumber; + private String accountPeriod; + private String postingTime; + private String postingTimeStart; + private String postingTimeEnd; + public void setParam(Page page, UserInfo userInfo) throws Exception { business = userInfo.getBusiness(); diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java index f3d10593..57c54540 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java @@ -96,6 +96,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl> result = null; if (StringUtils.isNotBlank(dto.getGfsh()) || dto.getGfTaxNo().size() > 0) { @@ -126,7 +132,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl> result = null; if (StringUtils.isNotBlank(dto.getGfsh()) || dto.getGfTaxNo().size() > 0) { @@ -1214,8 +1225,8 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl - and p.bzdh = #{bzdh} + and p.bzdh = #{queryParams.bzdh} - - and p.inaccount_status = #{inaccountStatus} + + and p.inaccount_status = #{queryParams.inAccountStatus} + + + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + + + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} + + + and p.image_id = #{queryParams.imageNumber} + + + and p.account_period = #{queryParams.accountPeriod} @@ -365,6 +382,26 @@ + + and p.bzdh = #{queryParams.bzdh} + + + and p.inaccount_status = #{queryParams.inAccountStatus} + + + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + + + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} + + + and p.image_id = #{queryParams.imageNumber} + + + and p.account_period = #{queryParams.accountPeriod} + + and p.gf_tax_no = #{queryParams.gfsh} @@ -815,8 +852,12 @@ p.cxrz_status as cxrzStatus, p.bdk_status as bdkStatus, p.dept_name as businessName, - p.inaccount_status as inaccountStatus, - p.bzdh bzdh + p.inaccount_status as inAccountStatus, + p.bzdh as bzdh, + p.image_id as imageNumber, + p.account_period as accountPeriod, + p.posting_time as postingTime, + p.sn_voucher_number as snVoucherNumber FROM t_dx_customs_record p where @@ -832,11 +873,23 @@ - and p.bzdh = #{bzdh} + and p.bzdh = #{queryParams.bzdh} - - and p.inaccount_status = #{inaccountStatus} + + and p.inaccount_status = #{queryParams.inAccountStatus} + + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + + + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} + + + and p.image_id = #{queryParams.imageNumber} + + + and p.account_period = #{queryParams.accountPeriod} @@ -1059,11 +1112,22 @@ - and p.bzdh = #{bzdh} + and p.bzdh = #{queryParams.bzdh} - - - and p.inaccount_status = #{inaccountStatus} + + and p.inaccount_status = #{queryParams.inAccountStatus} + + + and p.sn_voucher_number = #{queryParams.snVoucherNumber} + + + and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd} + + + and p.image_id = #{queryParams.imageNumber} + + + and p.account_period = #{queryParams.accountPeriod} 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 7e9d23e9..6ab31378 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 @@ -148,7 +148,7 @@ public class ExtFpzhcxController extends AbstractController { } if(pramsMap.get("imageNumber") != null){ - pramsMap.put("imageId",pramsMap.get("imageNumber")); + pramsMap.put("imageNumber",pramsMap.get("imageNumber")); } if(pramsMap.get("snVoucherNumber") != null){ @@ -215,7 +215,7 @@ public class ExtFpzhcxController extends AbstractController { data.put("dbName", getUserInfo().getDbName()); data.put("business", getUserInfo().getBusiness()); data.put("bzdh",pramsMap.get("bzdh")); - data.put("inaccountStatus",pramsMap.get("inaccountStatus")); + 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()); @@ -265,6 +265,7 @@ public class ExtFpzhcxController extends AbstractController { data.put("company", pramsMap.get("company")); data.put("menuId", pramsMap.get("menuId")); + data.put("imageNumber",pramsMap.get("imageNumber")); try { return ResponseEntity.ok(R.ok().put("data", ycfpcxService.selectByPramsMap(data, curr, size))); } catch (Exception e) { 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 3938744e..82d6696c 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 @@ -182,7 +182,9 @@ public class ExtBbfpzhcxRespVO implements Serializable { private String snVoucherNumber; private String postingTime; - private String imageId; + private String postingTimeStart; + private String postingTimeEnd; + private String imageNumber; private String accountPeriod; private String compCode; private String bzdh; diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index ffdd3ba0..551591b5 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -43,7 +43,7 @@ - + @@ -181,8 +181,8 @@ and posting_time between #{postingTimeStart} and #{postingTimeEnd} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} @@ -435,8 +435,8 @@ and t.posting_time = #{postingTime} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod}