Browse Source

bug优化

licailing 4 years ago
parent
commit
89f4823fd7

+ 1 - 1
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeAwardService.java

@@ -289,7 +289,7 @@ public class ProgrammeAwardService {
                         programme.setScore(0.0);
                     }
                 })
-                .sorted(Comparator.comparingDouble(Programme::getScore))
+                .sorted((a, b) -> b.getScore().compareTo(a.getScore()))
                 .collect(Collectors.groupingBy(Programme::getParentSpecialtyId));
 
         //获得奖项优先级

+ 6 - 0
src/main/vue/src/views/performance/ProgScoreAdminList.vue

@@ -35,6 +35,9 @@
                             >
                             </el-cascader>
                         </el-form-item>
+                        <el-form-item label="节目编号">
+                            <el-input placeholder="节目编号" v-model="form.id" clearable></el-input>
+                        </el-form-item>
                         <el-form-item>
                             <el-button @click="getData" type="primary" icon="el-icon-search" size="mini"
                                 >查询
@@ -350,6 +353,9 @@ export default {
             if (this.form.specialtyId) {
                 data.query.code = this.getCode(this.form.specialtyId);
             }
+            if (this.form.id) {
+                data.query.id = this.form.id;
+            }
             return data;
         },
         toggleMultipleMode(multipleMode) {

+ 11 - 0
src/main/vue/src/views/performance/ProgrammeResultList.vue

@@ -97,6 +97,13 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="节目编号">
+                                    <el-input placeholder="节目编号" v-model="form.id" clearable></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                     </div>
                 </el-collapse-transition>
                 <div style="width:100%;textAlign:center;margin-bottom:10px;">
@@ -379,6 +386,7 @@ export default {
         },
         beforeGetData() {
             let data = {
+                sort: 'awardId,desc',
                 query: {
                     programmeStatus: 'SUBMIT'
                 }
@@ -398,6 +406,9 @@ export default {
             if (this.form.name) {
                 data.query.name = this.form.name;
             }
+            if (this.form.id) {
+                data.query.id = this.form.id;
+            }
             if (this.form.awardId) {
                 data.query.awardId = this.form.awardId;
             }