备案修改

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

@@ -2,7 +2,6 @@ package com.izouma.wenlvju.domain;
 
 import com.izouma.wenlvju.annotations.Searchable;
 import com.izouma.wenlvju.annotations.SearchableOne;
-import com.izouma.wenlvju.enums.RecordStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,8 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import java.time.LocalDate;
 
 @Data
@@ -79,10 +76,6 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "备案时间")
     private LocalDate recordTime;
 
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "状态")
-    private RecordStatus status;
-
     private String district;
 
     @ApiModelProperty(value = "考试简章")
@@ -97,14 +90,7 @@ public class Record extends BaseEntity {
     @ApiModelProperty(value = "合格人数")
     private int numOfQualified;
 
-    @ApiModelProperty(value = "监管人员")
-    private Long supervisorUserId;
-
-//    @ApiModelProperty(value = "监管状态")
-//    @Enumerated(EnumType.STRING)
-//    private RegulatoryStatus regulatoryStatus;
-//
-//    @Transient
-//    private String supervisorNickname;
+//    @ApiModelProperty(value = "监管人员")
+//    private Long supervisorUserId;
 
 }

src/main/java/com/izouma/wenlvju/dto/RecordExcelDTO.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.dto;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.wenlvju.annotations.SearchableOne;
 import com.izouma.wenlvju.domain.Record;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -28,14 +29,15 @@ public class RecordExcelDTO {
     @ExcelProperty(value = "承办单位名称")
     private String organizer;
 
+    @SearchableOne
     @ExcelProperty(value = "考级地点")
     private String district;
 
     @ExcelProperty(value = "备案时间")
     private LocalDate recordTime;
 
-    @ExcelProperty(value = "状态")
-    private String status;
+//    @ExcelProperty(value = "状态")
+//    private String status;
 
     public RecordExcelDTO(Record record) {
         this.examinationName = record.getExaminationName();
@@ -44,6 +46,6 @@ public class RecordExcelDTO {
         this.organizer = record.getOrganizer();
         this.district = record.getDistrict();
         this.recordTime = record.getRecordTime();
-        this.status = record.getStatus().getSpec();
+//        this.status = record.getStatus().getSpec();
     }
 }

src/main/java/com/izouma/wenlvju/repo/RecordRepo.java

@@ -17,6 +17,6 @@ public interface RecordRepo extends JpaRepository<Record, Long>, JpaSpecificatio
 
     Record findFirstByDelIsTrue();
 
-    List<Record> findAllBySupervisorUserId(Long supervisorUserId);
+//    List<Record> findAllBySupervisorUserId(Long supervisorUserId);
 
 }

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

@@ -52,9 +52,10 @@ public class RecordService {
     }
 
     public Record addSupervisor(Long id, Long userId) {
-        Record record = recordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        record.setSupervisorUserId(userId);
-        return recordRepo.save(record);
+//        Record record = recordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+//        record.setSupervisorUserId(userId);
+//        return recordRepo.save(record);
+        return null;
     }
 
     /*

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

@@ -103,7 +103,8 @@ public class RecordController extends BaseController {
 
     @GetMapping("/supervisor")
     public List<Record> supervisor() {
-        return recordRepo.findAllBySupervisorUserId(SecurityUtils.getAuthenticatedUser().getId());
+//        return recordRepo.findAllBySupervisorUserId(SecurityUtils.getAuthenticatedUser().getId());
+        return null;
     }
 
     @PostMapping("/byToday")

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

@@ -129,10 +129,27 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-divider direction="horizontal" content-position="left">考级专业</el-divider>
+            <el-table
+                :data="recordSpecialties"
+                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"
+            >
+                <el-table-column prop="name" label="专业名称" width="100"> </el-table-column>
+                <el-table-column prop="code" label="专业代码"> </el-table-column>
+                <el-table-column prop="level" label="总级数"> </el-table-column>
+                <el-table-column prop="numOfExam" label="考场数量"> </el-table-column>
+                <el-table-column prop="examinerQuantity" label="考官人数"> </el-table-column>
+                <el-table-column prop="numOfCandidates" label="考试人数"> </el-table-column>
+            </el-table>
             <el-form-item>
                 <div style="margin-top: 10px">
                     <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="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button> -->
                     <el-button @click="$router.go(-1)">取消</el-button>
                 </div>
             </el-form-item>
@@ -154,6 +171,19 @@ export default {
                     console.log(e);
                     this.$message.error(e.error);
                 });
+            this.$http
+                .post(
+                    'recordSpecialty/all',
+                    { size: 1000, query: { recordId: Number(this.$route.query.rid) } },
+                    { body: 'json' }
+                )
+                .then(res => {
+                    this.recordSpecialties = res.content;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
         }
         this.$http
             .get('/district/NJ')
@@ -187,7 +217,8 @@ export default {
                 { label: '已撤回', value: 'WITHDRAWN' }
             ],
             district: [],
-            dateRange: []
+            dateRange: [],
+            recordSpecialties: []
         };
     },
     methods: {

src/main/vue/src/views/record/RecordInfo.vue

@@ -2,7 +2,7 @@
     <div class="edit-view">
         <el-tabs v-model="active">
             <el-tab-pane label="基本信息" name="first"><RecordEdit ref="page1" @next="goNext"/></el-tab-pane>
-            <el-tab-pane label="备考专业" name="second"><RecordSpecialtyList ref="page2"/></el-tab-pane>
+            <!-- <el-tab-pane label="备考专业" name="second"><RecordSpecialtyList ref="page2"/></el-tab-pane> -->
             <el-tab-pane label="考场管理" name="third"><RecordRoomList ref="page3"/></el-tab-pane>
         </el-tabs>
 
@@ -11,7 +11,7 @@
 </template>
 <script>
 import RecordEdit from './RecordEdit.vue';
-import RecordSpecialtyList from './RecordSpecialtyList.vue';
+// import RecordSpecialtyList from './RecordSpecialtyList.vue';
 import RecordRoomList from './RecordRoomList.vue';
 export default {
     name: 'RecordInfo',
@@ -30,7 +30,7 @@ export default {
     },
     components: {
         RecordEdit,
-        RecordSpecialtyList,
+        // RecordSpecialtyList,
         RecordRoomList
     }
 };

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

@@ -1,79 +1,16 @@
 <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-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>
-            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input> -->
-            <div style="padding-left: 14px">
+            <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-width">
                 <label class="span-size">考级地点</label>
-                <el-select class="filter-item" v-model="province">
-                    <el-option value="江苏省" label="江苏省"></el-option>
-                </el-select>
-                <el-select class="filter-item" v-model="city">
-                    <el-option value="南京市" label="南京市"></el-option>
-                </el-select>
                 <el-select class="filter-item" v-model="districtId" clearable placeholder="请选择区县">
                     <el-option
                         v-for="item in district"
@@ -82,24 +19,42 @@
                         :label="item.name"
                     ></el-option>
                 </el-select>
-            </div>
-            <div style="padding-left: 20px">
-                <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" icon="el-icon-refresh" class="filter-item"
+            </span>
+            <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-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 style="padding-left: 20px">
+            <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" icon="el-icon-refresh" class="filter-item"
                     >一键获取
                 </el-button> -->
-                <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
-                <el-button
-                    @click="download"
-                    type="primary"
-                    icon="el-icon-download"
-                    :loading="downloading"
-                    class="filter-item"
-                    :disabled="totalElements <= 0"
-                    >导出EXCEL
-                </el-button>
-            </div>
+            <!-- <el-button @click="distribute" type="primary" class="filter-item">一键分发 </el-button> -->
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                :disabled="totalElements <= 0"
+                >导出EXCEL
+            </el-button>
         </div>
         <el-table
             :data="tableData"
@@ -123,7 +78,6 @@
             <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">
                 <template slot-scope="{ row }">
                     <el-button @click="editRow(row)" type="primary" size="mini" plain>查看</el-button>

src/main/vue/src/views/record/RecordRoomList.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="list-view">
         <div class="filters-container">
-            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
-            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索</el-button>
+            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索</el-button> -->
             <el-button @click="openDialog" type="primary" icon="el-icon-plus" class="filter-item" v-if="showAdd"
                 >添加</el-button
             >