demo修改bug

src/main/vue/src/views/RecordDistrictList.vue

@@ -1,11 +1,10 @@
 <template>
     <div class="list-view">
         <div class="filters-container">
-            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input> -->
             <!-- <el-select class="filter-item" v-model="districtId" clearable v-if="display">
                 <el-option v-for="item in district" :key="item.id" :value="item.name" :label="item.name"></el-option>
             </el-select> -->
-            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
             <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button> -->
             <!-- <el-button @click="update" type="primary" class="filter-item">一键更新 </el-button> -->
             <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
@@ -17,6 +16,81 @@
                 class="filter-item"
                 >导出EXCEL
             </el-button> -->
+            <div>
+                <span class="span-width">
+                    <span class="span-size">考级活动名称</span>
+                    <el-input placeholder="输入考级活动名称" v-model="search" clearable class="filter-item"></el-input>
+                </span>
+                <span class="span-width">
+                    <span class="span-size">考级机构名称</span>
+                    <el-input placeholder="输入考级机构名称" v-model="agency" clearable class="filter-item"></el-input>
+                </span>
+                <span class="span-width2">
+                    <label class="span-size">考级活动时间</label>
+                    <el-date-picker
+                        v-model="dateRange"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        start-placeholder="请选择开始时间"
+                        end-placeholder="请选择结束时间"
+                        range-separator="至"
+                        class="filter-item"
+                    >
+                    </el-date-picker>
+                </span>
+            </div>
+            <div>
+                <span class="span-width">
+                    <span class="span-size">承办单位名称</span>
+                    <el-input
+                        placeholder="输入承办单位名称"
+                        v-model="organizer"
+                        clearable
+                        class="filter-item"
+                    ></el-input>
+                </span>
+                <span class="span-width">
+                    <label class="span-size">状态</label>
+                    <el-select
+                        class="filter-item"
+                        v-model="status"
+                        clearable
+                        placeholder="请选择状态"
+                        style="width: 200px"
+                    >
+                        <el-option
+                            v-for="item in statusOptions"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </span>
+                <span class="span-width2">
+                    <label class="span-size">备案时间</label>
+                    <el-date-picker
+                        v-model="recordDateRange"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        start-placeholder="请选择开始时间"
+                        end-placeholder="请选择结束时间"
+                        range-separator="至"
+                        class="filter-item"
+                    >
+                    </el-date-picker>
+                </span>
+            </div>
+            <div style="padding-left: 20px">
+                <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
+                <el-button
+                    @click="download"
+                    type="primary"
+                    icon="el-icon-download"
+                    :loading="downloading"
+                    class="filter-item"
+                    >导出EXCEL
+                </el-button>
+            </div>
         </div>
         <el-table
             :data="tableData"
@@ -100,7 +174,12 @@ export default {
             statusOptions: [{ label: '正常', value: 'NORMAL' }],
             district: [],
             districtId: '',
-            display: false
+            display: false,
+            status: '',
+            recordDateRange: '',
+            agency: '',
+            organizer: '',
+            dateRange: ''
         };
     },
     computed: {
@@ -125,14 +204,33 @@ export default {
             return '';
         },
         beforeGetData() {
-            return {
-                search: this.search,
-                sort: 'recordTime,desc',
-                query: {
-                    district: '玄武区',
-                    del: false
-                }
-            };
+            // return {
+            //     search: this.search,
+            //     sort: 'recordTime,desc',
+            //     query: {
+            //         district: '玄武区',
+            //         del: false
+            //     }
+            // };
+            let data = { sort: 'recordTime,desc', query: { del: false } };
+            data.query.district = '玄武区';
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.recordDateRange && this.recordDateRange.length > 0) {
+                data.query.recordTime = this.recordDateRange[0] + ',' + this.recordDateRange[1];
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.examinationStartTime = this.dateRange[0] + ',' + this.dateRange[1];
+                data.query.examinationEndTime = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            if (this.agency) {
+                data.query.examinationAgency = this.agency;
+            }
+            if (this.organizer) {
+                data.query.organizer = this.organizer;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;
@@ -161,7 +259,13 @@ export default {
             this.$axios
                 .get('/record/excel', {
                     responseType: 'blob',
-                    params: { size: 10000 }
+                    params: {
+                        size: 10000,
+                        query: {
+                            del: false,
+                            district: '玄武区'
+                        }
+                    }
                 })
                 .then(res => {
                     console.log(res);
@@ -236,4 +340,22 @@ export default {
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.span-size {
+    font-size: 14px;
+    color: #565b66;
+    line-height: 15px;
+    padding: 0 10px 0 10px;
+}
+.span-width {
+    width: 330px;
+    display: inline-block;
+    text-align: right;
+}
+.span-width2 {
+    width: 500px;
+    // float: left;
+    text-align: right;
+    display: inline-block;
+}
+</style>

src/main/vue/src/views/RecordList.vue

@@ -216,7 +216,7 @@ export default {
             //         del: false
             //     }
             // };
-            let data = { sort: 'recordTime,desc', query: {} };
+            let data = { sort: 'recordTime,desc', query: { del: false } };
             if (this.search) {
                 data.search = this.search;
             }
@@ -265,7 +265,12 @@ export default {
             this.$axios
                 .get('/record/excel', {
                     responseType: 'blob',
-                    params: { size: 10000 }
+                    params: {
+                        size: 10000,
+                        query: {
+                            del: false
+                        }
+                    }
                 })
                 .then(res => {
                     console.log(res);

src/test/java/com/izouma/wenlvju/service/RecordServiceTest.java

@@ -0,0 +1,17 @@
+package com.izouma.wenlvju.service;
+
+import com.izouma.wenlvju.ApplicationTests;
+import com.izouma.wenlvju.dto.PageQuery;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+class RecordServiceTest extends ApplicationTests {
+
+    @Autowired
+    private RecordService recordService;
+
+    @Test
+    void all() {
+        System.out.println(recordService.all(new PageQuery()).getTotalElements());
+    }
+}