备案上传 /检查记录

src/main/java/com/izouma/wenlvju/domain/Record.java

@@ -72,7 +72,6 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "备案时间")
     private LocalDate recordTime;
 
-    @SearchableOne
     private String district;
 
     @ApiModelProperty(value = "考试简章")

src/main/java/com/izouma/wenlvju/domain/regulation/RecordCheck.java

@@ -0,0 +1,35 @@
+package com.izouma.wenlvju.domain.regulation;
+
+import com.izouma.wenlvju.converter.StringArrayConverter;
+import com.izouma.wenlvju.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Where(clause = "del = 0")
+@ApiModel(value = "备案检查")
+public class RecordCheck extends BaseEntity {
+    private Long recordId;
+
+    @Column(columnDefinition = "TEXT")
+    private String content;
+
+    @Convert(converter = StringArrayConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<String> files;
+
+    private Long userId;
+}

src/main/java/com/izouma/wenlvju/repo/regulation/RecordCheckRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo.regulation;
+
+import com.izouma.wenlvju.domain.regulation.RecordCheck;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface RecordCheckRepo extends JpaRepository<RecordCheck, Long>, JpaSpecificationExecutor<RecordCheck> {
+    @Query("update RecordCheck t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/service/RecordService.java

@@ -51,13 +51,24 @@ public class RecordService {
             query.remove("examinationTime");
         }
 
+        Object today = query.get("today");
+        LocalDate todayDate = null;
+        if (today != null) {
+            todayDate = Convert.toLocalDateTime(today).toLocalDate();
+            query.remove("today");
+        }
+
         LocalDate finalDate = date;
+        LocalDate finalTodayDate = todayDate;
         return recordRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, Record.class, root, criteriaQuery, criteriaBuilder);
             if (ObjectUtil.isNotEmpty(finalDate)) {
                 and.add(criteriaBuilder.lessThanOrEqualTo(root.get("examinationStartTime"), finalDate));
                 and.add(criteriaBuilder.greaterThanOrEqualTo(root.get("examinationEndTime"), finalDate));
             }
+            if (ObjectUtil.isNotEmpty(finalTodayDate)) {
+                and.add(criteriaBuilder.lessThanOrEqualTo(root.get("examinationStartTime"), finalTodayDate));
+            }
             return criteriaBuilder.and(and.toArray(new Predicate[0]));
         }, JpaUtils.toPageRequest(pageQuery));
     }

src/main/java/com/izouma/wenlvju/service/regulation/RecordCheckService.java

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service.regulation;
+
+import com.izouma.wenlvju.domain.regulation.RecordCheck;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.regulation.RecordCheckRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RecordCheckService {
+
+    private RecordCheckRepo recordCheckRepo;
+
+    public Page<RecordCheck> all(PageQuery pageQuery) {
+        return recordCheckRepo.findAll(JpaUtils.toSpecification(pageQuery, RecordCheck.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/wenlvju/utils/JpaUtils.java

@@ -139,6 +139,8 @@ public class JpaUtils {
                 SearchableOne annotation = field.getAnnotation(SearchableOne.class);
                 if (annotation != null && annotation.value()) {
                     and.add(criteriaBuilder.like(root.get(field.getName()), "%" + value + "%"));
+                } else {
+                    and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
                 }
 
             } else {

src/main/java/com/izouma/wenlvju/web/RecordController.java

@@ -2,14 +2,11 @@ package com.izouma.wenlvju.web;
 
 import cn.hutool.core.collection.CollUtil;
 import com.izouma.wenlvju.domain.Record;
-import com.izouma.wenlvju.domain.User;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.dto.RecordDTO;
-import com.izouma.wenlvju.enums.AuthorityName;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.RecordRepo;
 import com.izouma.wenlvju.repo.UserRepo;
-import com.izouma.wenlvju.security.Authority;
 import com.izouma.wenlvju.service.RecordService;
 import com.izouma.wenlvju.utils.ObjUtils;
 import com.izouma.wenlvju.utils.excel.ExcelUtils;
@@ -25,8 +22,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RestController
@@ -92,9 +87,9 @@ public class RecordController extends BaseController {
 
     @PostMapping("/allDTO")
     public Page<Record> allDTO(@RequestBody PageQuery pageQuery) {
-        Map<Long, String> userMap = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_SUPERVISOR))
-                .stream()
-                .collect(Collectors.toMap(User::getId, User::getNickname));
+//        Map<Long, String> userMap = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.get(AuthorityName.ROLE_SUPERVISOR))
+//                .stream()
+//                .collect(Collectors.toMap(User::getId, User::getNickname));
         return recordService.all(pageQuery);
 //                .map(record -> {
 //                    record.setSupervisorNickname(userMap.get(record.getSupervisorUserId()));

src/main/java/com/izouma/wenlvju/web/regulation/RecordCheckController.java

@@ -0,0 +1,63 @@
+package com.izouma.wenlvju.web.regulation;
+
+import com.izouma.wenlvju.web.BaseController;
+import com.izouma.wenlvju.domain.regulation.RecordCheck;
+import com.izouma.wenlvju.service.regulation.RecordCheckService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.regulation.RecordCheckRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/recordCheck")
+@AllArgsConstructor
+public class RecordCheckController extends BaseController {
+    private RecordCheckService recordCheckService;
+    private RecordCheckRepo    recordCheckRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RecordCheck save(@RequestBody RecordCheck record) {
+        if (record.getId() != null) {
+            RecordCheck orig = recordCheckRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return recordCheckRepo.save(orig);
+        }
+        return recordCheckRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RecordCheck> all(@RequestBody PageQuery pageQuery) {
+        return recordCheckService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RecordCheck get(@PathVariable Long id) {
+        return recordCheckRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        recordCheckRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RecordCheck> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/RecordCheck.json

@@ -0,0 +1,41 @@
+{
+  "tableName": "RecordCheck",
+  "className": "RecordCheck",
+  "remark": "检查记录",
+  "genTable": true,
+  "genClass": true,
+  "genList": false,
+  "genForm": true,
+  "genRouter": false,
+  "javaPath": "/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju",
+  "viewPath": "/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views",
+  "routerPath": "/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src",
+  "resourcesPath": "/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources",
+  "dataBaseType": "Mysql",
+  "fields": [
+    {
+      "name": "content",
+      "modelName": "content",
+      "remark": "检查情况",
+      "showInList": true,
+      "showInForm": true,
+      "formType": "textarea"
+    },
+    {
+      "name": "files",
+      "modelName": "files",
+      "remark": "作证材料",
+      "showInList": true,
+      "showInForm": true,
+      "formType": "fileUpload"
+    }
+  ],
+  "readTable": false,
+  "dataSourceCode": "dataSource",
+  "genJson": "",
+  "subtables": [],
+  "update": false,
+  "basePackage": "com.izouma.wenlvju",
+  "tablePackage": "com.izouma.wenlvju.domain.regulation.RecordCheck",
+  "genPackage": "regulation"
+}

src/main/vue/src/views/RecordCheckEdit.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="content" label="检查情况">
+                <el-input type="textarea" v-model="formData.content"></el-input>
+            </el-form-item>
+            <el-form-item prop="files" label="作证材料">
+                <el-upload class="upload-demo" action="../upload/file" :on-change="handleChange" :file-list="fileList3">
+                    <el-button size="small" type="primary">
+                        点击上传
+                    </el-button>
+                </el-upload>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除</el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'RecordCheckEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('recordCheck/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {}
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = {...this.formData};
+
+            this.saving = true;
+            this.$http
+                .post('/recordCheck/save', data, {body: 'json'})
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'})
+                .then(() => {
+                    return this.$http.post(`/recordCheck/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/record/RecordEdit.vue

@@ -109,25 +109,6 @@
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
-                    <el-form-item prop="status" label="状态">
-                        <el-select
-                            v-model="formData.status"
-                            clearable
-                            filterable
-                            placeholder="请选择"
-                            style="width: 100%"
-                        >
-                            <el-option
-                                v-for="item in statusOptions"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                            >
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
             </el-row>
             <el-divider direction="horizontal" content-position="left">考级专业</el-divider>
             <el-table
@@ -211,10 +192,6 @@ export default {
                 }
             },
             categoryOptions: [{ label: '承办单位', value: 'ORGANIZER' }],
-            statusOptions: [
-                { label: '正常', value: 'NORMAL' },
-                { label: '已撤回', value: 'WITHDRAWN' }
-            ],
             district: [],
             dateRange: [],
             recordSpecialties: []

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

@@ -79,19 +79,19 @@
             cell-class-name="table-cell"
             :height="tableHeight"
         >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="examinationName" label="考级活动名称"> </el-table-column>
-            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip>
+            <el-table-column prop="examinationName" label="考级活动名称" min-width="150"></el-table-column>
+            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="160">
                 <template slot-scope="{ row }">
                     <span>{{ row.examinationStartTime }} 至 {{ row.examinationEndTime }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="examinationAgency" label="考级机构名称"> </el-table-column>
-            <el-table-column prop="organizer" label="承办单位名称"> </el-table-column>
-            <el-table-column prop="district" label="考级地点"> </el-table-column>
-            <el-table-column prop="recordTime" label="备案时间"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="80">
+            <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150"></el-table-column>
+            <el-table-column prop="organizer" label="承办单位名称" min-width="150"></el-table-column>
+            <el-table-column prop="district" label="考级地点" min-width="70"></el-table-column>
+            <el-table-column prop="recordTime" label="备案时间" min-width="90"></el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="75">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
                     <!-- <el-button @click="openRoom(row)" type="warning" size="mini" plain>考场</el-button> -->
@@ -129,7 +129,7 @@ export default {
     name: 'RecordList',
     mixins: [pageableTable],
     created() {
-        this.uploadUrl = resolveUrl(this.$baseUrl, 'record/update');
+        this.uploadUrl = resolveUrl(this.$baseUrl, 'record/upload');
         this.$http
             .get('/district/NJ')
             .then(res => {
@@ -186,14 +186,6 @@ export default {
             return '';
         },
         beforeGetData() {
-            // return {
-            //     search: this.search,
-            //     sort: 'recordTime,desc',
-            //     query: {
-            //         district: this.districtId,
-            //         del: false
-            //     }
-            // };
             let data = { sort: 'recordTime,desc', query: { del: false } };
             if (this.search) {
                 data.search = this.search;

src/main/vue/src/views/record/RecordList2.vue

@@ -1,271 +0,0 @@
-<template>
-    <div class="list-view">
-        <div class="filters-container">
-            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input> -->
-            <el-select class="filter-item" v-model="districtId" clearable>
-                <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="download"
-                type="primary"
-                icon="el-icon-download"
-                :loading="downloading"
-                class="filter-item"
-                >导出EXCEL
-            </el-button> -->
-        </div>
-        <el-table
-            :data="tableData"
-            row-key="id"
-            ref="table"
-            header-row-class-name="table-header-row"
-            header-cell-class-name="table-header-cell"
-            row-class-name="table-row"
-            cell-class-name="table-cell"
-            :height="tableHeight"
-        >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="organizer" label="承办单位"> </el-table-column>
-            <el-table-column prop="district" label="通讯地址"> </el-table-column>
-            <el-table-column prop="privacyPolicy" label="法人姓名"> </el-table-column>
-            <el-table-column prop="idno" label="证件号码"> </el-table-column>
-            <el-table-column prop="examinationAgency" label="所属考级机构"> </el-table-column>
-            <el-table-column prop="recordTime" label="备案时间"> </el-table-column>
-            <el-table-column prop="supervisorNickname" label="监管人员"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="80">
-                <template slot-scope="{ row }">
-                    <el-button @click="supervision(row.id)" type="primary" size="mini" plain>分配监管人</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination-wrapper">
-            <!-- <div class="multiple-mode-wrapper">
-                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
-                <el-button-group v-else>
-                    <el-button @click="operation1">批量操作1</el-button>
-                    <el-button @click="operation2">批量操作2</el-button>
-                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
-                </el-button-group>
-            </div> -->
-            <el-pagination
-                background
-                @size-change="onSizeChange"
-                @current-change="onCurrentChange"
-                :current-page="page"
-                :page-sizes="[10, 20, 30, 40, 50]"
-                :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="totalElements"
-            >
-            </el-pagination>
-        </div>
-        <el-dialog title="分配监管人" :visible.sync="dialogVisible" width="500px" center>
-            <div>
-                <el-table :data="supervisor">
-                    <el-table-column prop="nickname" label="昵称"></el-table-column>
-                    <el-table-column prop="phone" label="手机号"></el-table-column>
-                    <el-table-column label="操作" align="center" fixed="right" min-width="80">
-                        <template slot-scope="{ row }">
-                            <el-button @click="addRegulatory(row.id)" type="success" size="mini" plain>确认</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex';
-import pageableTable from '@/mixins/pageableTable';
-
-export default {
-    name: 'RecordList',
-    mixins: [pageableTable],
-    created() {
-        this.$http
-            .get('/district/NJ')
-            .then(res => {
-                this.district = res;
-            })
-            .catch(e => {
-                console.log(e);
-                this.$message.error(e.error);
-            });
-    },
-    mounted() {
-        this.$http
-            .post('/user/authority', { authorityName: 'ROLE_SUPERVISOR' })
-            .then(res => {
-                this.supervisor = res;
-                // if (res.length > 0) {
-                //     res.forEach(item => {
-                //         this.supervisor.push({
-                //             label: item.nickname,
-                //             value: item.id
-                //         });
-                //     });
-                // }
-            })
-            .catch(e => {
-                console.log(e);
-                this.$message.error(e.error);
-            });
-    },
-    data() {
-        return {
-            multipleMode: false,
-            search: '',
-            url: '/record/allDTO',
-            downloading: false,
-            district: [],
-            districtId: '',
-            supervisor: [],
-            dialogVisible: false,
-            recordId: ''
-        };
-    },
-    computed: {
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        categoryFormatter(row, column, cellValue, index) {
-            let selectedOption = this.categoryOptions.find(i => i.value === cellValue);
-            if (selectedOption) {
-                return selectedOption.label;
-            }
-            return '';
-        },
-        statusFormatter(row, column, cellValue, index) {
-            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-            if (selectedOption) {
-                return selectedOption.label;
-            }
-            return '';
-        },
-        beforeGetData() {
-            return {
-                search: this.search,
-                sort: 'recordTime,desc',
-                query: {
-                    district: this.districtId,
-                    del: false
-                }
-            };
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        addRow() {
-            this.$router.push({
-                path: '/recordEdit',
-                query: {
-                    ...this.$route.query
-                }
-            });
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/recordEdit',
-                query: {
-                    id: row.id
-                }
-            });
-        },
-        download() {
-            this.downloading = true;
-            this.$axios
-                .get('/record/excel', {
-                    responseType: 'blob',
-                    params: { size: 10000 }
-                })
-                .then(res => {
-                    console.log(res);
-                    this.downloading = false;
-                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
-                    const link = document.createElement('a');
-                    link.href = downloadUrl;
-                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
-                    document.body.appendChild(link);
-                    link.click();
-                    link.remove();
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.downloading = false;
-                    this.$message.error(e.error);
-                });
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
-                .then(() => {
-                    return this.$http.post(`/record/del/${row.id}`);
-                })
-                .then(() => {
-                    this.$message.success('删除成功');
-                    this.getData();
-                })
-                .catch(e => {
-                    if (e !== 'cancel') {
-                        this.$message.error(e.error);
-                    }
-                });
-        },
-        distribute() {
-            this.$alert('已分发到各区县！', '分发', {
-                confirmButtonText: '确定'
-            });
-        },
-        update() {
-            this.$http
-                .get('/record/update')
-                .then(res => {
-                    this.getData();
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.$message.error(e.error);
-                });
-        },
-        supervision(id) {
-            this.dialogVisible = true;
-            this.recordId = id;
-        },
-        addRegulatory(id) {
-            this.$http
-                .post('/record/addSupervisor', {
-                    id: this.recordId,
-                    userId: id
-                })
-                .then(res => {
-                    this.saving = false;
-                    this.$message.success('成功');
-                    this.dialogVisible = false;
-                    this.recordId = '';
-                    this.getData();
-                })
-                .catch(e => {
-                    console.log(e);
-                    this.saving = false;
-                    this.$message.error(e.error);
-                });
-        }
-    }
-};
-</script>
-<style lang="less" scoped></style>

src/main/vue/src/views/record/RecordOrganizationList.vue

@@ -23,20 +23,19 @@
             cell-class-name="table-cell"
             :height="tableHeight"
         >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="examinationName" label="考级活动名称"> </el-table-column>
-            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip>
+            <el-table-column prop="examinationName" label="考级活动名称" min-width="150"></el-table-column>
+            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="160">
                 <template slot-scope="{ row }">
                     <span>{{ row.examinationStartTime }} 至 {{ row.examinationEndTime }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="examinationAgency" label="考级机构名称"> </el-table-column>
-            <el-table-column prop="organizer" label="承办单位名称"> </el-table-column>
-            <el-table-column prop="district" label="考级地点"> </el-table-column>
-            <el-table-column prop="recordTime" label="备案时间"> </el-table-column>
-            <el-table-column prop="status" label="状态" :formatter="statusFormatter" width="50"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="140">
+            <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150"></el-table-column>
+            <el-table-column prop="organizer" label="承办单位名称" min-width="150"></el-table-column>
+            <el-table-column prop="district" label="考级地点" min-width="70"></el-table-column>
+            <el-table-column prop="recordTime" label="备案时间" min-width="90"></el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="75">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
@@ -91,7 +90,6 @@ export default {
             url: '/record/byOrganization',
             downloading: false,
             categoryOptions: [{ label: '承办单位', value: 'ORGANIZER' }],
-            statusOptions: [{ label: '正常', value: 'NORMAL' }],
             district: [],
             districtId: '',
             province: '江苏省',
@@ -118,13 +116,6 @@ export default {
             }
             return '';
         },
-        statusFormatter(row, column, cellValue, index) {
-            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-            if (selectedOption) {
-                return selectedOption.label;
-            }
-            return '';
-        },
         beforeGetData() {
             return {
                 // search: this.search,

src/main/vue/src/views/record/RecordRegulationList.vue

@@ -1,46 +1,53 @@
 <template>
     <div class="list-view">
         <div class="filters-container">
-            <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-width2">
-                    <span class="span-size">考级地址</span>
-                    <el-select class="filter-item" v-model="city">
-                        <el-option value="南京市" label="南京市"></el-option>
-                    </el-select>
-                    <el-select class="filter-item" v-model="district" clearable placeholder="请选择区县">
-                        <el-option
-                            v-for="item in districts"
-                            :key="item.id"
-                            :value="item.name"
-                            :label="item.name"
-                        ></el-option>
-                    </el-select>
-                </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-width">
-                    <span class="span-size">承办单位名称</span>
-                    <el-input
-                        placeholder="输入承办单位名称"
-                        v-model="organizer"
-                        clearable
-                        class="filter-item"
-                    ></el-input>
-                </span> -->
-            </div>
-            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input> -->
-            <div style="padding-left: 20px">
-                <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">查询 </el-button>
-                <el-button @click="showVideo" type="primary" icon="el-icon-video-camera" class="filter-item"
+            <el-col :span="7">
+                <span class="span-size">考级活动名称</span>
+                <el-input placeholder="输入考级活动名称" v-model="search" clearable class="filter-item"></el-input>
+            </el-col>
+            <el-col :span="7">
+                <span class="span-size">考级机构名称</span>
+                <el-input placeholder="输入考级机构名称" v-model="agency" clearable class="filter-item"></el-input>
+            </el-col>
+            <el-col :span="7">
+                <label class="span-size">考级地点</label>
+                <el-select class="filter-item" v-model="districtId" clearable placeholder="请选择区县">
+                    <el-option
+                        v-for="item in district"
+                        :key="item.id"
+                        :value="item.name"
+                        :label="item.name"
+                    ></el-option>
+                </el-select>
+            </el-col>
+            <el-col :span="7">
+                <span class="span-size">承办单位名称</span>
+                <el-input placeholder="输入承办单位名称" v-model="organizer" clearable class="filter-item"></el-input>
+            </el-col>
+
+            <el-col :span="14">
+                <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>
+            </el-col>
+            <el-col :span="12">
+                <div style="padding-left: 20px">
+                    <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item"
+                    >查询
+                    </el-button>
+                    <el-button @click="showVideo" type="primary" icon="el-icon-video-camera" class="filter-item"
                     >监控平台
-                </el-button>
-            </div>
+                    </el-button>
+                </div>
+            </el-col>
         </div>
         <el-table
             :data="tableData"
@@ -52,23 +59,31 @@
             cell-class-name="table-cell"
             :height="tableHeight"
         >
-            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"></el-table-column>
             <!-- <el-table-column prop="id" label="ID" width="100"> </el-table-column> -->
-            <el-table-column prop="examinationName" label="考级活动名称"> </el-table-column>
-            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip>
+            <el-table-column prop="examinationName" label="考级活动名称" min-width="150"></el-table-column>
+            <el-table-column prop="examinationStartTime" label="考级活动时间" show-overflow-tooltip min-width="160">
                 <template slot-scope="{ row }">
                     <span>{{ row.examinationStartTime }} 至 {{ row.examinationEndTime }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="examinationAgency" label="考级机构名称"> </el-table-column>
-            <el-table-column prop="organizer" label="承办单位名称"> </el-table-column>
-            <el-table-column prop="district" label="考级地点"> </el-table-column>
-            <el-table-column prop="recordTime" label="备案时间"> </el-table-column>
-            <el-table-column prop="status" label="状态" :formatter="statusFormatter" width="50"> </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" min-width="80">
+            <el-table-column prop="examinationAgency" label="考级机构名称" min-width="150" sortable></el-table-column>
+            <el-table-column prop="organizer" label="承办单位名称" min-width="150" sortable></el-table-column>
+            <el-table-column prop="district" label="考级地点" min-width="70"></el-table-column>
+            <el-table-column prop="recordTime" label="备案时间" min-width="90"></el-table-column>
+            <el-table-column label="操作" align="right" fixed="right" min-width="240">
                 <template slot-scope="{ row }">
+                    <el-button
+                        @click="openRoom(row)"
+                        type="warning"
+                        size="mini"
+                        plain
+                        v-if="currentTime < row.examinationEndTime"
+                    >考场监控
+                    </el-button
+                    >
+                    <el-button @click="openRoom(row)" type="warning" size="mini" plain>检查记录</el-button>
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>
-                    <el-button @click="openRoom(row)" type="warning" size="mini" plain>考场</el-button>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
             </el-table-column>
@@ -116,6 +131,7 @@ export default {
                 console.log(e);
                 this.$message.error(e.error);
             });
+        this.currentTime = format(new Date(), 'yyyy-MM-dd');
     },
     data() {
         return {
@@ -123,8 +139,7 @@ export default {
             search: '',
             url: '/record/all',
             downloading: false,
-            categoryOptions: [{ label: '承办单位', value: 'ORGANIZER' }],
-            statusOptions: [{ label: '正常', value: 'NORMAL' }],
+            categoryOptions: [{label: '承办单位', value: 'ORGANIZER'}],
             districts: [],
             district: '',
             city: '南京市',
@@ -132,7 +147,8 @@ export default {
             recordDateRange: '',
             agency: '',
             organizer: '',
-            dateRange: ''
+            dateRange: '',
+            currentTime: ''
         };
     },
     computed: {
@@ -148,27 +164,12 @@ export default {
             }
             return '';
         },
-        statusFormatter(row, column, cellValue, index) {
-            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-            if (selectedOption) {
-                return selectedOption.label;
-            }
-            return '';
-        },
         beforeGetData() {
-            // return {
-            //     search: this.search,
-            //     sort: 'recordTime,desc',
-            //     query: {
-            //         district: this.districtId,
-            //         del: false
-            //     }
-            // };
             let data = {
-                sort: 'recordTime,desc',
+                sort: 'examinationEndTime,desc',
                 query: {
                     del: false,
-                    examinationTime: format(new Date(), 'yyyy-MM-dd')
+                    today: format(new Date(), 'yyyy-MM-dd')
                 }
             };
             if (this.search) {