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 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 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 @@ + + + + + +