等级评定

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

@@ -31,6 +31,6 @@ public interface RateRepo extends JpaRepository<Rate, Long>, JpaSpecificationExe
     @Query(nativeQuery = true, value = "select count(1) from rate where del=0 and (expert_user_id = ?1 or find_in_set(?1,expert_member_user_id))")
     Long countByExpertId(Long userId);
 
-    List<Rate> findAllByStatusAndYear(RateStatus status, String year);
+    List<Rate> findAllByStatusAndYearOrderByScoreDesc(RateStatus status, String year);
 
 }

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

@@ -614,7 +614,7 @@ public class RateService {
      * @param announcement 是否公告短信
      */
     public void batchSendSms(boolean announcement) {
-        List<Rate> rates = rateRepo.findAllByStatusAndYear(RateStatus.SUBMIT_PAPER_MATERIALS, String.valueOf(LocalDate.now()
+        List<Rate> rates = rateRepo.findAllByStatusAndYearOrderByScoreDesc(RateStatus.SUBMIT_PAPER_MATERIALS, String.valueOf(LocalDate.now()
                 .getYear()));
         String phones = rates.stream().map(Rate::getOwnerPhone).collect(Collectors.joining(","));
 
@@ -629,9 +629,9 @@ public class RateService {
      * 等级
      */
     public void gradeRatio(double excellent, double eligible, Long userId) {
-        List<Rate> rates = rateRepo.findAllByStatusAndYear(RateStatus.SUBMIT_GRADE, String.valueOf(LocalDate.now()
+        List<Rate> rates = rateRepo.findAllByStatusAndYearOrderByScoreDesc(RateStatus.SUBMIT_GRADE, String.valueOf(LocalDate.now()
                 .getYear()));
-        rates.sort(Comparator.comparingInt(Rate::getSort));
+//        rates.sort((a, b) -> Integer.compare(b.getScore(), a.getSort()));
         int size = rates.size();
         int excellentSum = (int) Math.round(size * excellent / 100);
         if (excellentSum >= size) {

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

@@ -309,6 +309,8 @@ public class ProgrammeService {
                     // 专业
                     if (ObjectUtil.isNotNull(specialty)) {
                         programme.setSpecialtyId(specialty.getId());
+                    } else {
+                        throw new BusinessException("专业名称不正确，仔细核对专业表");
                     }
 
                     // 节目状态
@@ -355,11 +357,20 @@ public class ProgrammeService {
                 Participant participant = new Participant(dto);
                 if (ObjectUtil.isNotNull(dto.getParticipantBirthday())) {
                     if (dto.getParticipantBirthday().contains("/")) {
-                        LocalDate birthday = LocalDate.parse(dto.getParticipantBirthday(), DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_FORMAT1));
-                        participant.setBirthday(birthday);
+                        try {
+                            LocalDate birthday = LocalDate.parse(dto.getParticipantBirthday(), DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_FORMAT1));
+                            participant.setBirthday(birthday);
+                        } catch (Exception e) {
+                            throw new BusinessException("日期格式错误");
+                        }
+
                     } else if (dto.getParticipantBirthday().contains("-")) {
-                        LocalDate birthday = LocalDate.parse(dto.getParticipantBirthday(), DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_FORMAT));
-                        participant.setBirthday(birthday);
+                        try {
+                            LocalDate birthday = LocalDate.parse(dto.getParticipantBirthday(), DateTimeFormatter.ofPattern(DateConfig.DEFAULT_DATE_FORMAT));
+                            participant.setBirthday(birthday);
+                        } catch (Exception e) {
+                            throw new BusinessException("日期格式错误");
+                        }
                     } else {
                         throw new BusinessException("日期格式错误！");
                     }

src/main/vue/src/views/rate/RateListDone.vue

@@ -156,9 +156,6 @@
                     <span v-if="row.score">{{ row.score }}</span>
                     <span v-else>暂无</span>
                 </template>
-                <template slot="header" slot-scope="{ column }">
-                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
-                </template>
             </el-table-column>
             <el-table-column prop="grade" label="等级">
                 <template slot-scope="{ row }">
@@ -354,7 +351,7 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'sort,desc;createdAt,desc',
+                sort: 'sort,desc;score,desc;createdAt,desc',
                 query: {
                     submit: true,
                     status: ['REVIEW_PENDING', 'SUBMIT_PAPER_MATERIALS', 'COMPLETE']