证书

src/main/h5/src/views/Home.vue

@@ -77,26 +77,26 @@
           <div class="text2">{{ info.award }}</div>
         </div>
       </div>
-      <div class="base-info">
-        <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
-        <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
-        <div
-          v-for="(time, index) in info.participants"
-          :key="index"
-          style="margin-top: 12px"
-        >
+      <div
+        v-for="(time, index) in info.participants"
+        :key="index"
+        style="margin-top: 12px"
+      >
+        <div class="base-info">
+          <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
+          <img
+            class="right-icon icon"
+            src="../assets/icon_lianjie.png"
+            alt=""
+          />
+
           <div class="base-info-item" v-if="time.img">
             <div class="text1">证件照</div>
-            <!-- <img
-              v-else
-              style="width:55px;height:68px;margin-left:17px"
-              :src="time.img"
-              alt=""
-            /> -->
             <van-image
               fit="cover"
               style="margin-left:17px"
               :src="time.img"
+              @click="preview(1, time.img)"
               width="55px"
               height="68px"
             />
@@ -111,15 +111,40 @@
               {{ time.birthday }}
             </div>
           </div>
+          <div class="base-info-item" v-if="time.awardImg">
+            <div class="text1">证书</div>
+            <van-image
+              fit="cover"
+              style="margin-left:17px"
+              :src="time.awardImg"
+              @click="preview(1, time.awardImg)"
+              width="124px"
+              height="87px"
+            />
+          </div>
         </div>
 
-        <div class="base-info-item" v-if="isAdmin">
+        <!-- <div class="base-info-item" v-if="isAdmin">
           <div class="text1">操作状态</div>
           <div class="text2">
             {{ info.signInAt ? (myScore ? "已评分" : "未评分") : "未签到" }}
           </div>
-        </div>
+        </div> -->
       </div>
+
+      <!-- <div class="base-info">
+        <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
+        <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
+        <div class="base-info-item" v-if="time.img">
+          <van-image
+            fit="cover"
+            style="margin-left:17px"
+            :src="time.img"
+            width="55px"
+            height="68px"
+          />
+        </div>
+      </div> -->
       <!-- <div class="base-info" v-if="info.signInAt && isScore">
         <img class="left-icon icon" src="../assets/icon_lianjie.png" alt="" />
         <img class="right-icon icon" src="../assets/icon_lianjie.png" alt="" />
@@ -187,7 +212,7 @@
       </div> -->
     </div>
 
-    <template v-if="isAdmin">
+    <!-- <template v-if="isAdmin">
       <div class="bottom" v-if="!info.signInAt">
         <van-button @click="sign" round block :color="$colors.prim">
           立即签到
@@ -228,7 +253,7 @@
           下一个
         </van-button>
       </div>
-    </template>
+    </template> -->
   </div>
 </template>
 
@@ -354,9 +379,6 @@ export default {
           ) {
             this.getRelated();
           }
-          return this.$http.post("/participant/byProgramme", {
-            programmeId: programmeId
-          });
         })
         .then(res => {
           this.persons = res;
@@ -367,7 +389,6 @@ export default {
           this.$http
             .post("/programmeScore/breakdown?programmeId=" + programmeId)
             .then(res => {
-              // console.log(res, "111");
               this.scores = res;
             });
           // if (this.isAdmin) {

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

@@ -34,6 +34,9 @@ public class ParticipantDTO {
     @ApiModelProperty(value = "奖状")
     private String award;
 
+    @ApiModelProperty(value = "奖状图片")
+    private String awardImg;
+
     public ParticipantDTO(Participant participant) {
         BeanUtil.copyProperties(participant, this);
     }

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

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.annotations.EnumFormat;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.enums.CompetitionGroup;
+import com.izouma.wenlvju.enums.PerformanceStatus;
 import com.izouma.wenlvju.enums.ProgrammeStatus;
 import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
 import lombok.AllArgsConstructor;
@@ -26,6 +27,15 @@ public class ProgrammeShowDTO {
     @ExcelIgnore
     private String performance;
 
+    @ExcelIgnore
+    private Long performanceId;
+
+    @ExcelIgnore
+    private PerformanceStatus performanceStatus;
+
+//    @ExcelIgnore
+//    private boolean online;
+
     @ExcelProperty(value = "节目名称")
     private String name;
 

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

@@ -13,7 +13,6 @@ import com.izouma.wenlvju.domain.performance.Participant;
 import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.dto.PageQuery;
 import com.izouma.wenlvju.exception.BusinessException;
-import com.izouma.wenlvju.repo.AwardRepo;
 import com.izouma.wenlvju.repo.performance.ParticipantRepo;
 import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
 import com.izouma.wenlvju.service.storage.StorageService;
@@ -31,8 +30,6 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.net.BindException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
@@ -46,7 +43,6 @@ public class ParticipantService {
 
     private ParticipantRepo participantRepo;
     private ProgrammeRepo   programmeRepo;
-    private AwardRepo       awardRepo;
     private StorageService  storageService;
 
     public Page<Participant> all(PageQuery pageQuery) {

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

@@ -963,7 +963,11 @@ public class ProgrammeService {
         userService.getAuth(id, phone, apply.getPhone(), apply.getInstructorPhone());
         ProgrammeShowDTO showDTO = this.toShowDTO(apply);
         awardRepo.findById(apply.getAwardId()).ifPresent(aw -> showDTO.setAward(aw.getName()));
-        performanceRepo.findById(apply.getPerformanceId()).ifPresent(pe -> showDTO.setShowAward(pe.isShowAward()));
+        performanceRepo.findById(apply.getPerformanceId()).ifPresent(pe -> {
+            showDTO.setShowAward(pe.isShowAward());
+            showDTO.setPerformanceStatus(pe.getStatus());
+//            showDTO.setOnline(pe.isOnline());
+        });
         return showDTO;
     }