From 1f5817cfd002ab4641fe5f9f0eb3fd7a2bec6c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Mon, 5 Jun 2023 10:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/model/payment/PaymentPagination.java    |  1 +
 .../payment/service/impl/PaymentServiceImpl.java    | 11 +++++++++++
 .../views/scm/basicInformation/payment/index.vue    | 13 +++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java
index c3dd8a54..e3a6039d 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentPagination.java
@@ -27,6 +27,7 @@ public class PaymentPagination extends Pagination {
     private String status;
     private Date startDate;
     private Date endDate;
+    private List<String> businessdate;
 
     /**
      * 添加权限
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
index dfe2ab9c..f888fbb4 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/service/impl/PaymentServiceImpl.java
@@ -132,6 +132,17 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, PaymentEntity
 
         }
 
+        if(StringUtil.isNotEmpty(paymentPagination.getBusinessdate())){
+            paymentNum++;
+            List<String> PoundDateList =  paymentPagination.getBusinessdate();
+            Long fir = Long.valueOf(PoundDateList.get(0));
+            Long sec = Long.valueOf(PoundDateList.get(1));
+
+            paymentQueryWrapper.lambda().ge(PaymentEntity::getBusinessdate, new Date(fir))
+                    .le(PaymentEntity::getBusinessdate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+        }
+
 
         if(AllIdList.size()>0){
             paymentQueryWrapper.lambda().in(PaymentEntity::getId, AllIdList);
diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue
index e93456c2..c6a2f58d 100644
--- a/SC-web/src/views/scm/basicInformation/payment/index.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/index.vue
@@ -58,6 +58,19 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+            <el-col :span="6">
+              <el-form-item label="实付日期">
+                <el-date-picker
+                  v-model="query.businessdate"
+                  type="daterange"
+                  value-format="timestamp"
+                  format="yyyy-MM-dd"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="单据状态">
                 <el-select