Pārlūkot izejas kodu

bug修复调整

dzx 1 gadu atpakaļ
vecāks
revīzija
8fd1c15b7c

+ 2 - 2
src/main/java/com/xjrsoft/module/activity/controller/ActivityEnrollController.java

@@ -147,9 +147,9 @@ public class ActivityEnrollController {
         }
 
         ByteArrayOutputStream bot = new ByteArrayOutputStream();
-        EasyExcel.write(bot, BandingTaskClassExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
+        EasyExcel.write(bot, ActivityEnrollExcelVo.class).automaticMergeHead(false).excelType(ExcelTypeEnum.XLSX).sheet().doWrite(list);
 
-        return RT.fileStream(bot.toByteArray(), "banding" + ExcelTypeEnum.XLSX.getValue());
+        return RT.fileStream(bot.toByteArray(), "enroll" + ExcelTypeEnum.XLSX.getValue());
     }
 
     @PostMapping(value = "/enroll")

+ 3 - 0
src/main/java/com/xjrsoft/module/textbook/dto/AddTextbookDto.java

@@ -150,4 +150,7 @@ public class AddTextbookDto implements Serializable {
 
     @ApiModelProperty("编著作总数")
     private Integer workTotalCount;
+
+    @ApiModelProperty("教材类型")
+    private String textbookCategory;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/textbook/entity/Textbook.java

@@ -209,4 +209,7 @@ public class Textbook implements Serializable {
 
     @ApiModelProperty("编著作总数")
     private Integer workTotalCount;
+
+    @ApiModelProperty("教材类型")
+    private String textbookCategory;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/textbook/vo/TextbookPageVo.java

@@ -186,4 +186,7 @@ public class TextbookPageVo {
 
     @ApiModelProperty("编著作总数")
     private Integer workTotalCount;
+
+    @ApiModelProperty("教材类型")
+    private String textbookCategory;
 }

+ 3 - 0
src/main/java/com/xjrsoft/module/textbook/vo/TextbookVo.java

@@ -134,4 +134,7 @@ public class TextbookVo {
 
     @ApiModelProperty("编著作总数")
     private Integer workTotalCount;
+
+    @ApiModelProperty("教材类型")
+    private String textbookCategory;
 }