发票列表增加开票时间筛选

admin-web/src/views/admin/invoice/index.vue

@@ -48,6 +48,20 @@
             @blur="loadData(true)"
             class="wd150 mr10">
         </ext-d-select>
+        <ext-date-picker
+            v-model="state.formQuery.startTime"
+            placeholder="开票时间（起）"
+            clearable
+            @blur="loadData(true)"
+            class="wd150 mr10">
+        </ext-date-picker>
+        <ext-date-picker
+            v-model="state.formQuery.endTime"
+            placeholder="开票时间（止）"
+            clearable
+            @blur="loadData(true)"
+            class="wd150 mr10">
+        </ext-date-picker>
         <ext-d-select
             v-model="state.formQuery.invoiceType"
             placeholder="发票类型"
@@ -63,7 +77,6 @@
             @blur="loadData(true)"
             class="wd150 mr10">
         </el-input>
-
         <el-input
             v-model="state.formQuery.invoiceTitle"
             placeholder="发票抬头名称"
@@ -206,6 +219,7 @@ import ExtPage from '/@/components/form/ExtPage.vue'
 import mittBus from '/@/utils/mitt';
 import ExtDSelect from "/@/components/form/ExtDSelect.vue";
 import ExtDLabel from "/@/components/form/ExtDLabel.vue";
+import ExtDatePicker from "/@/components/form/ExtDatePicker.vue";
 
 const InvoiceDialog = defineAsyncComponent(() => import("/@/views/admin/invoice/dialog.vue"));
 
@@ -217,6 +231,7 @@ const invoiceDialogRef = ref();
 
 const pdfViewer = ref()
 
+
 //定义变量
 const state = reactive({
   formQuery: {
@@ -413,4 +428,4 @@ const handleCancelInvoice = (row:any) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

entity/src/main/java/com/kym/entity/admin/queryParams/InvoiceQueryParam.java

@@ -1,8 +1,11 @@
 package com.kym.entity.admin.queryParams;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.common.PageParams;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * @author skyline
@@ -48,4 +51,12 @@ public class InvoiceQueryParam extends PageParams {
      * 电话
      */
     private String phone;
+
+    /**
+     * 开票时间（开始结束）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endTime;
 }

service/src/main/java/com/kym/service/miniapp/impl/InvoiceServiceImpl.java

@@ -1,16 +1,11 @@
 package com.kym.service.miniapp.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.github.pagehelper.PageHelper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.kym.common.IQuery;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.OrderUtils;
@@ -18,7 +13,6 @@ import com.kym.entity.admin.InvoiceDetail;
 import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.entity.miniapp.DataDict;
 import com.kym.entity.miniapp.Invoice;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.queryParams.ApplyInvoiceParams;
@@ -35,11 +29,8 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -116,6 +107,8 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
             throw new BusinessException("订单总金额或总电费或总服务费金额异常");
         }
         // 组装invoice
+
+        // todo 先放入缓存，等待抬头填写完成之后再写入数据库，设置超期时间，过期主动查询抬头填写情况
         var invoice = new Invoice()
                 .setUserId(userId)
                 .setOpenid(StpUtil.getSession().getString("openid"))
@@ -146,7 +139,9 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
                 .select(User::getMobilePhone)
                 .select(InvoiceDetail::getFapiaoTime)
                 .leftJoin(User.class, User::getId, Invoice::getUserId)
-                .leftJoin(InvoiceDetail.class, InvoiceDetail::getApplyId,Invoice::getApplyId)
+                .leftJoin(InvoiceDetail.class, InvoiceDetail::getApplyId, Invoice::getApplyId)
+                .gt(CommUtil.isNotEmptyAndNull(params.getStartTime()), InvoiceDetail::getFapiaoTime, params.getStartTime())
+                .lt(CommUtil.isNotEmptyAndNull(params.getEndTime()), InvoiceDetail::getFapiaoTime, params.getEndTime())
                 .like(CommUtil.isNotEmptyAndNull(params.getPhone()), User::getMobilePhone, params.getPhone())
                 .like(CommUtil.isNotEmptyAndNull(params.getInvoiceTitle()), Invoice::getInvoiceTitle, params.getInvoiceTitle())
                 .like(CommUtil.isNotEmptyAndNull(params.getBiller()), Invoice::getBiller, params.getBiller())