Merge branch 'Regulation' of http://git.izouma.com/licailing/wenlvju into Regulation

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

@@ -0,0 +1,38 @@
+package com.izouma.wenlvju.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.wenlvju.domain.performance.Participant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "参演人员")
+public class ParticipantDTO {
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private String sex;
+
+    @ApiModelProperty(value = "出生年月")
+    private LocalDate birthday;
+
+    @ApiModelProperty(value = "照片")
+    private String img;
+
+    @ApiModelProperty(value = "证书")
+    private String certificate;
+
+    public ParticipantDTO(Participant participant) {
+        BeanUtil.copyProperties(this, participant);
+    }
+}

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

@@ -19,6 +19,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -66,9 +67,7 @@ public class ProgrammeShowDTO {
 
     private String annex;
 
-    private int status;
-
-
+    private List<ParticipantDTO> participants;
 
     public ProgrammeShowDTO(Programme programme) {
         BeanUtil.copyProperties(programme, this);

src/main/java/com/izouma/wenlvju/security/WebSecurityConfig.java

@@ -70,11 +70,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/rate/test").permitAll()
                 .antMatchers("/district/NJ").permitAll()
                 .antMatchers("/setting/byFlag").permitAll()
-                .antMatchers("/performanceApply/get/**").permitAll()
-                .antMatchers("/performanceApply/getAuth").permitAll()
-                .antMatchers("/performanceScore/breakdown").permitAll()
-                .antMatchers("/person/byPerApplyId").permitAll()
-                .antMatchers("/person/all").permitAll()
+                .antMatchers("/programme/getShow/**").permitAll()
                 .antMatchers("/upload/**").permitAll()
                 .antMatchers("/files/**").permitAll()
                 .antMatchers("/static/**").permitAll()

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -607,4 +607,15 @@ public class ProgrammeService {
         programme.setStatus(2);
         programmeRepo.save(programme);
     }
+
+    /*
+    考级机构显示节目详情
+     */
+    public ProgrammeShowDTO showByGO(Long id) {
+        Programme programme = programmeRepo.findById(id).orElseThrow(new BusinessException("无节目"));
+        ProgrammeShowDTO dto = new ProgrammeShowDTO(programme);
+        List<ParticipantDTO> participants = participantRepo.findAllByProgrammeId(id).stream().map(ParticipantDTO::new).collect(Collectors.toList());
+        dto.setParticipants(participants);
+        return dto;
+    }
 }

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

@@ -143,8 +143,10 @@ public class ProgrammeController extends BaseController {
         programmeService.firstAudit(id, pass);
     }
 
-    public ProgrammeShowDTO getShow(Long id) {
-        return null;
+    @GetMapping("/getShow/{id}")
+    @ApiOperation("考级机构查看节目信息")
+    public ProgrammeShowDTO getShow(@PathVariable Long id) {
+        return programmeService.showByGO(id);
     }
 
 }