结果页

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

@@ -241,7 +241,8 @@ public class ProgrammeController extends BaseController {
         return programmeService.result(pageQuery);
     }
 
-    @PostMapping("/excelResult")
+    @GetMapping("/excelResult")
+    @ResponseBody
     public void excelResult(HttpServletResponse response, PageQuery pageQuery) throws IOException {
         List<ProgrammeResultDTO> data = this.result(pageQuery).getContent();
         ExcelUtils.export(response, data);

src/main/vue/src/views/performance/ProgrammeResultList.vue

@@ -114,7 +114,7 @@
                 <el-form-item>
                     <el-button @click="getData" type="primary" icon="el-icon-search">查询 </el-button>
                     <el-button
-                        @click="downloadProgramme"
+                        @click="download"
                         type="primary"
                         icon="el-icon-download"
                         :loading="downloading"
@@ -227,7 +227,6 @@ export default {
             },
             specialtyId: '',
             showMore: false,
-            downloadProgramme: false,
             organizationIdOptions: [],
             awards: []
         };
@@ -415,26 +414,25 @@ export default {
 
             let data = {
                 size: 2000,
-                sort: 'createdAt,desc',
                 query: {
-                    organizationId: this.organization.id
+                    programmeStatus: 'SUBMIT'
                 }
             };
-            if (this.competitionGroup) {
-                data.query.competitionGroup = this.competitionGroup;
-            }
-            if (this.levelSettingId) {
-                data.query.levelSettingId = this.levelSettingId;
+            if (this.form.gradingOrganizationId) {
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
             }
-            if (this.gradingOrganizationId) {
-                data.query.gradingOrganizationId = this.gradingOrganizationId;
+            if (this.form.organizationId) {
+                data.query.organizationId = this.form.organizationId;
             }
-            if (this.specialtyId) {
-                data.query.code = this.getCode(this.specialtyId);
+            if (this.form.specialtyId) {
+                data.query.code = this.getCode(this.form.specialtyId);
             }
             if (this.performanceId) {
                 data.query.performanceId = this.performanceId;
             }
+            if (this.form.name) {
+                data.query.name = this.form.name;
+            }
             if (this.form.awardId) {
                 data.query.awardId = this.form.awardId;
             }