备案考官

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

@@ -0,0 +1,33 @@
+package com.izouma.wenlvju.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@Builder
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "备案专业考官")
+public class RecordExpert extends BaseEntity{
+    private Long recordSpecialtyId;
+
+    private String name;
+
+    private String sex;
+
+    @ApiModelProperty(value = "证件号码")
+    private String idNo;
+
+    @ApiModelProperty(value = "是否外聘")
+    private boolean external;
+
+    @ApiModelProperty(value = "职称")
+    private String position;
+}

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

@@ -0,0 +1,19 @@
+package com.izouma.wenlvju.repo;
+
+import com.izouma.wenlvju.domain.RecordExpert;
+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;
+import java.util.List;
+
+public interface RecordExpertRepo extends JpaRepository<RecordExpert, Long>, JpaSpecificationExecutor<RecordExpert> {
+    @Query("update RecordExpert t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    List<RecordExpert> findAllByRecordSpecialtyId(Long recordSpecialtyId);
+}

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

@@ -82,7 +82,7 @@ public class PerformanceApplyService {
         // 只编排通过的
         List<PerformanceApply> applyList =
                 performanceApplyRepo.findAllByStatusAndPerformanceId(ApplyStatus.PASS, performanceId);
-        LocalDate startDate = performance.getEventStartDate();
+//        LocalDate startDate = performance.getEventStartDate();
 //        LocalDate endDate = performance.getEndDate();
 //        LocalTime dayStart = performance.getMorningStartTime();
 //        LocalTime dayEnd = performance.getMorningEndTime();

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

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

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

@@ -0,0 +1,65 @@
+package com.izouma.wenlvju.web;
+
+import com.izouma.wenlvju.domain.RecordExpert;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.RecordExpertRepo;
+import com.izouma.wenlvju.service.RecordExpertService;
+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.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/recordExpert")
+@AllArgsConstructor
+public class RecordExpertController extends BaseController {
+    private RecordExpertService recordExpertService;
+    private RecordExpertRepo recordExpertRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RecordExpert save(@RequestBody RecordExpert record) {
+        if (record.getId() != null) {
+            RecordExpert orig = recordExpertRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return recordExpertRepo.save(orig);
+        }
+        return recordExpertRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RecordExpert> all(@RequestBody PageQuery pageQuery) {
+        return recordExpertService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RecordExpert get(@PathVariable Long id) {
+        return recordExpertRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        recordExpertRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RecordExpert> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+    @PostMapping("/bySpecialtyId")
+    public List<RecordExpert> bySpecialtyId(Long recordSpecialtyId){
+        return recordExpertRepo.findAllByRecordSpecialtyId(recordSpecialtyId);
+    }
+}
+

src/main/resources/genjson/RecordExpert.json

@@ -0,0 +1 @@
+{"tableName":"RecordExpert","className":"RecordExpert","remark":"考级专业考官","genTable":true,"genClass":true,"genList":true,"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":"recordSpecialtyId","modelName":"recordSpecialtyId","remark":"recordSpecialtyId","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"name","modelName":"name","remark":"姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"sex","modelName":"sex","remark":"性别","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"男\",\"value\":\"男\"},{\"label\":\"女\",\"value\":\"女\"}]"},{"name":"idNo","modelName":"idNo","remark":"证件号码","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"external","modelName":"external","remark":"是否外聘","showInList":true,"showInForm":true,"formType":"switch"},{"name":"position","modelName":"position","remark":"职称","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.RecordExpert"}

src/main/vue/src/router.js

@@ -564,6 +564,14 @@ const router = new Router({
                     meta: {
                         title: '咨询投诉'
                     }
+                },
+                {
+                    path: '/recordExpertEdit',
+                    name: 'RecordExpertEdit',
+                    component: () => import(/* webpackChunkName: "recordExpertEdit" */ '@/views/RecordExpertEdit.vue'),
+                    meta: {
+                        title: '考级专业考官编辑'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/RecordExpertEdit.vue

@@ -0,0 +1,114 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="139px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="recordSpecialtyId" label="recordSpecialtyId">
+                <el-input v-model="formData.recordSpecialtyId"></el-input>
+            </el-form-item>
+            <el-form-item prop="name" label="姓名">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="sex" label="性别">
+                <el-select v-model="formData.sex" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in sexOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="idNo" label="证件号码">
+                <el-input v-model="formData.idNo"></el-input>
+            </el-form-item>
+            <el-form-item prop="external" label="是否外聘">
+                <el-switch v-model="formData.external"></el-switch>
+            </el-form-item>
+            <el-form-item prop="position" label="职称">
+                <el-input v-model="formData.position"></el-input>
+            </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: 'RecordExpertEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('recordExpert/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: {},
+            sexOptions: [
+                { label: '男', value: '男' },
+                { label: '女', value: '女' }
+            ]
+        };
+    },
+    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('/recordExpert/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(`/recordExpert/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/RecordExpertList.vue

@@ -0,0 +1,175 @@
+<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-button @click="addRow" type="primary" icon="el-icon-plus" 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="name" label="姓名"> </el-table-column>
+            <el-table-column prop="sex" label="性别" :formatter="sexFormatter"> </el-table-column>
+            <el-table-column prop="idNo" label="证件号码"> </el-table-column>
+            <el-table-column prop="external" label="是否外聘">
+                <template slot-scope="{ row }">
+                    <el-tag :type="row.external ? '' : 'info'">{{ row.external }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="position" label="职称"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <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>
+                </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>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'RecordExpertList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/recordExpert/all',
+            downloading: false,
+            sexOptions: [
+                { label: '男', value: '男' },
+                { label: '女', value: '女' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        sexFormatter(row, column, cellValue, index) {
+            let selectedOption = this.sexOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/recordExpertEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/recordExpertEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/recordExpert/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(`/recordExpert/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

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

@@ -124,7 +124,11 @@
                 <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="examinerQuantity" label="考官人数">
+                    <template slot-scope="{ row }">
+                        <el-link @click="openDialog(row)">{{ row.examinerQuantity }}</el-link>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-form-item>
                 <div style="margin-top: 10px">
@@ -134,6 +138,32 @@
                 </div>
             </el-form-item>
         </el-form>
+        <el-dialog :visible.sync="dialogVisible" width="700px">
+            <el-table
+                :data="experts"
+                row-key="id"
+                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="sex" label="性别"> </el-table-column>
+                <el-table-column prop="idNo" label="证件号码"> </el-table-column>
+                <el-table-column prop="external" label="是否外聘">
+                    <template slot-scope="{ row }">
+                        <span v-if="row.external"> 是 </span>
+                        <span v-else>否</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="position" label="职称">
+                    <template slot-scope="{ row }">
+                        <span v-if="row.position"> {{ row.position }} </span>
+                        <span v-else>无</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -194,7 +224,9 @@ export default {
             categoryOptions: [{ label: '承办单位', value: 'ORGANIZER' }],
             district: [],
             dateRange: [],
-            recordSpecialties: []
+            recordSpecialties: [],
+            dialogVisible: false,
+            experts: []
         };
     },
     methods: {
@@ -240,6 +272,18 @@ export default {
                         this.$message.error((e || {}).error || '删除失败');
                     }
                 });
+        },
+        openDialog(row) {
+            this.dialogVisible = true;
+            this.$http
+                .post('recordExpert/bySpecialtyId', { recordSpecialtyId: row.id })
+                .then(res => {
+                    this.experts = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
         }
     }
 };
@@ -264,4 +308,8 @@ export default {
         flex-grow: 1;
     }
 }
+/deep/ .el-divider__text,
+.el-link {
+    font-size: 12px;
+}
 </style>

src/test/java/com/izouma/wenlvju/repo/RecordExpertRepoTest.java

@@ -0,0 +1,17 @@
+package com.izouma.wenlvju.repo;
+
+
+import com.izouma.wenlvju.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class RecordExpertRepoTest extends ApplicationTests {
+    @Autowired
+    private RecordExpertRepo recordExpertRepo;
+
+    @Test
+    public void  test(){
+        System.out.println(recordExpertRepo.findAllByRecordSpecialtyId(1129L));
+    }
+
+}