报名

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

@@ -0,0 +1,80 @@
+package com.izouma.wenlvju.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.wenlvju.annotations.EnumFormat;
+import com.izouma.wenlvju.domain.performance.Participant;
+import com.izouma.wenlvju.domain.performance.Programme;
+import com.izouma.wenlvju.enums.CompetitionGroup;
+import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
+import com.izouma.wenlvju.utils.excel.LocalDateConverter;
+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.EnumType;
+import javax.persistence.Enumerated;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProgrammeShowDTO {
+    private Long id;
+
+    @ApiModelProperty(value = "活动名称")
+    private String performance;
+
+    @ApiModelProperty(value = "节目名称")
+    private String name;
+
+    @ApiModelProperty(value = "参赛专业")
+    private String specialty;
+
+    @ApiModelProperty(value = "参赛组别")
+    private CompetitionGroup competitionGroup;
+
+    @ApiModelProperty(value = "参赛级别")
+    private String level;
+
+    @ApiModelProperty(value = "作品时长")
+    private int durationOfWork;
+
+    @ApiModelProperty(value = "指导老师")
+    private String instructor;
+
+    @ApiModelProperty(value = "考级机构")
+    private String gradingOrganization;
+
+    @ApiModelProperty(value = "承办单位")
+    private String organization;
+
+    @ApiModelProperty(value = "考级点")
+    private String examPoint;
+
+    @ApiModelProperty(value = "联系人")
+    private String contact;
+
+    @ApiModelProperty(value = "参赛人数")
+    private int quantity;
+
+    private String video;
+
+    private String annex;
+
+    private int status;
+
+
+
+    public ProgrammeShowDTO(Programme programme) {
+        BeanUtil.copyProperties(programme, this);
+        if (programme.getVideo() != null) {
+            this.video = programme.getVideo().getSrc();
+        }
+    }
+
+}

src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -1,10 +1,7 @@
 package com.izouma.wenlvju.web.performance;
 
 import com.izouma.wenlvju.domain.performance.Programme;
-import com.izouma.wenlvju.dto.ArrangeProgrammeDTO;
-import com.izouma.wenlvju.dto.PageQuery;
-import com.izouma.wenlvju.dto.ProgrammeDTO;
-import com.izouma.wenlvju.dto.ProgrammeScoreDTO;
+import com.izouma.wenlvju.dto.*;
 import com.izouma.wenlvju.enums.SignedIn;
 import com.izouma.wenlvju.exception.BusinessException;
 import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
@@ -145,5 +142,10 @@ public class ProgrammeController extends BaseController {
     public void firstAudit(@RequestParam Long id, boolean pass) {
         programmeService.firstAudit(id, pass);
     }
+
+    public ProgrammeShowDTO getShow(Long id) {
+        return null;
+    }
+
 }
 

src/main/vue/src/views/performance/PerformanceEdit.vue

@@ -332,7 +332,7 @@ export default {
                         schedules.splice(index, 1);
                     }
                     this.schedules = schedules;
-                    this.$message.success('删除成功');
+                    // this.$message.success('删除成功');
                 })
                 .catch(e => {});
         },
@@ -342,7 +342,7 @@ export default {
                     const phones = [...this.phones];
                     phones.splice(index, 1);
                     this.phones = phones;
-                    this.$message.success('删除成功');
+                    // this.$message.success('删除成功');
                 })
                 .catch(e => {});
         },

src/main/vue/src/views/performance/PerformanceShow.vue

@@ -71,6 +71,7 @@
                                                 end-placeholder="结束时间"
                                                 range-separator="至"
                                                 style="width: 240px"
+                                                readonly
                                             >
                                             </el-date-picker>
                                         </el-form-item>

src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -159,6 +159,9 @@
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width"></el-input>
                         </el-form-item>
+                        <el-form-item prop="instructorPhone" label="联系电话">
+                            <el-input v-model="formData.instructorPhone" class="width"></el-input>
+                        </el-form-item>
                         <el-form-item
                             prop="annex"
                             label="作品图片"

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -180,7 +180,7 @@
             </el-table-column>
             <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
             <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column>
-            <el-table-column label="操作" align="left" fixed="right" min-width="200">
+            <el-table-column label="操作" align="left" fixed="right" min-width="320">
                 <template slot-scope="{ row }">
                     <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
                     <el-button
@@ -218,8 +218,8 @@
                         >浏览图片</el-button
                     >
                     <el-button type="warning" @click="playVideo(row)" v-else size="mini" plain>浏览视频</el-button>
-                    <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>通过</el-button>
-                    <el-button @click="showCode(row)" type="danger" size="mini" plain>拒绝</el-button> -->
+                    <el-button @click="audit(row, true)" type="primary" size="mini" plain>通过</el-button>
+                    <el-button @click="audit(row, false)" type="danger" size="mini" plain>不通过</el-button>
                     <!-- <el-button @click="showCode(row)" type="primary" size="mini" plain>查看二维码</el-button> -->
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
                 </template>
@@ -253,15 +253,7 @@
             </div>
         </el-dialog>
 
-        <el-dialog
-            class="videoDialog"
-            destroy-on-close
-            center
-            append-to-body
-            :visible.sync="showViedo"
-            @close="closeEvent"
-            width="70%"
-        >
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
             <video
                 :src="videoUrl"
                 controlsList="nodownload noremote footbar"
@@ -275,6 +267,9 @@
                 您的浏览器不支持 video 标签。
             </video>
         </el-dialog>
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showImg" width="35%">
+            <img style="height: 100%; max-width: 100%" :src="annex" alt="" />
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -316,7 +311,9 @@ export default {
                 expandTrigger: 'hover'
             },
             showViedo: false,
-            videoUrl: ''
+            showImg: false,
+            videoUrl: '',
+            annex: ''
         };
     },
     created() {
@@ -602,49 +599,49 @@ export default {
             }
             return result;
         },
-        closeEvent() {
-            document.exitPictureInPicture();
-        },
+        // closeEvent() {
+        //     document.exitPictureInPicture();
+        // },
         playVideo(row) {
             this.showViedo = true;
             this.videoUrl = row.video;
-            console.log(row.video);
         },
-        audit(row, status) {
+        playImg(row) {
+            this.showImg = true;
+            this.annex = row.annex;
+        },
+        audit(row, pass) {
             this.$set(row, 'loading', true);
-            if (row.status === 1) {
-                this.$confirm('确认此承办单位同意上报?', '提示', {
-                    confirmButtonText: '同意上报',
-                    cancelButtonText: '取消',
-                    type: 'warning'
-                })
-                    .then(() => {
-                        this.$http
-                            .post('/rate/audit', {
-                                id: row.id,
-                                status: status,
-                                score: 0,
-                                remark: remark
-                            })
-                            .then(res => {
-                                this.$set(row, 'loading', false);
-                                this.$message.success('上报成功');
-                                this.getData();
-                            })
-                            .catch(e => {
-                                console.log(e);
-                                this.$set(row, 'loading', false);
-                                this.$message.error(e.error);
-                            });
-                    })
-                    .catch(() => {
-                        this.$message({
-                            type: 'info',
-                            message: '已取消'
+
+            this.$confirm('审核后将不能修改或撤回，确认要审核吗？', '提示', {
+                confirmButtonText: '审核',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    this.$http
+                        .post('/programme/firstAudit', {
+                            id: row.id,
+                            pass: pass
+                        })
+                        .then(res => {
+                            this.$set(row, 'loading', false);
+                            this.$message.success('审核成功');
+                            this.getData();
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.$set(row, 'loading', false);
+                            this.$message.error(e.error);
                         });
-                        this.$set(row, 'loading', false);
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
                     });
-            }
+                    this.$set(row, 'loading', false);
+                });
         }
     }
 };

src/main/vue/src/views/performance/ProgrammeShow.vue

@@ -122,6 +122,9 @@
                         <el-form-item prop="instructor" label="指导老师">
                             <el-input v-model="formData.instructor" class="width" readonly></el-input>
                         </el-form-item>
+                        <el-form-item prop="instructorPhone" label="联系电话">
+                            <el-input v-model="formData.instructorPhone" class="width" readonly></el-input>
+                        </el-form-item>
                         <el-form-item
                             prop="annex"
                             label="作品图片"

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

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(469L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(10148L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }