From 24923e6da20d9fb3bb7fca1f21a9678ae6e26d47 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sat, 18 Mar 2023 14:58:59 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E8=AE=A4=E8=AF=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 10 +++++++ .../base/entity/BaseTDxRecordInvoice.java | 10 +++++++ .../com/dxhy/base/model/BaseFpRzRespVO.java | 13 +++++++++ .../main/resources/mapper/BaseFpZhMapper.xml | 28 +++++++++++++++---- 4 files changed, 56 insertions(+), 5 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 502ee0f3..eba93093 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 @@ -130,6 +130,16 @@ public class BaseInvoiceController extends AbstractController { int curr = (int)map.get("curr"); int size = (int)map.get("size"); Map pramsMap = new HashMap<>(25); + + pramsMap.put("qszt", map.get("qszt")); + pramsMap.put("wrzfpStart", map.get("wrzfpStart")); + pramsMap.put("wrzfpEnd", map.get("wrzfpEnd")); + pramsMap.put("imageNumber", map.get("imageNumber")); + pramsMap.put("postingTimeStart", map.get("postingTimeStart")); + pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); + pramsMap.put("accountPeriodStart", map.get("accountPeriodStart")); + pramsMap.put("accountPeriodEnd", map.get("accountPeriodEnd")); + pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); pramsMap.put("company", map.get("company")); pramsMap.put("menuId", map.get("menuId")); pramsMap.put("xfmc", xfmc); 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 2fd4096d..76c091e0 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 @@ -466,4 +466,14 @@ public class BaseTDxRecordInvoice implements Serializable { private String inAccountStatus; private String invoiceSource; + + //凭证号 + private String snVoucherNumber; + //账期 + private Date accountPeriod; + //过账时间 + private Date postingTime; + + + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index 517d1f8a..da7fbd30 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -1,7 +1,9 @@ package com.dxhy.base.model; import java.io.Serializable; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; /** @@ -187,4 +189,15 @@ public class BaseFpRzRespVO implements Serializable { public BaseFpRzRespVO() {} + //凭证号 SN + private String snVoucherNumber; + //账期 SN + @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone="GMT+8") + private Date accountPeriod; + //过账时间 SN + @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone="GMT+8") + private Date postingTime; + //影像号 SN + private String imageNumber; + } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index a9f4583d..d54a78f0 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -60,7 +60,7 @@ dqskssq,t.auth_status,t.qs_type,t.qs_status,t.confirm_user,t.qs_name,t.rzh_yesorno,t.cxrz_status,t.out_status, t.bdk_status,t.bdk_current_period,date_format(t.bdk_date,'%Y-%m-%d') bdk_date,t.rzh_back_msg,t.in_account_status,t.payment_status,date_format(t.payment_date,'%Y-%m-%d')payment_date, - voucher_number + voucher_number, sn_voucher_number, account_period, posting_time ,image_number from t_dx_record_invoice t WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} @@ -84,16 +84,31 @@ and t.qs_type = #{qsfs} - + + and t.qs_status = #{qszt} + + + and rzh_yesorno = '0' and date_format(t.invoice_date,'%Y-%m-%d') between #{wrzfpStart} and #{wrzfpEnd} + + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq} - + and date_format(t.rzh_date,'%Y-%m-%d') between #{rzksrq} and #{rzjsrq} + + + and date_format(t.account_period,'%Y-%m') between #{accountPeriodStart} and #{accountPeriodEnd} + + + and date_format(t.posting_time,'%Y-%m-%d') between #{postingTimeStart} and #{postingTimeEnd} and t.rzh_yesorno = #{rzzt} + + + and t.image_number = #{imageNumber} and t.auth_status = #{rzclzt} @@ -145,6 +160,9 @@ and t.rzh_belong_date = #{skssq} + + + and t.sn_voucher_number = #{snVoucherNumber}