1、试听课

2、收费网管课活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExtraExerciseStudentsDto.java

@@ -26,10 +26,29 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
     private String statusStr;
     private String isRepliedStr;
     private String isViewStr;
+    private String isRepliedTimelyStr;
 
     @ApiModelProperty(value = "是否存在vip课")
     private Integer existVipCourse;
 
+    private String existVipCourseStr;
+
+    public String getIsRepliedTimelyStr() {
+        return isRepliedTimelyStr;
+    }
+
+    public void setIsRepliedTimelyStr(String isRepliedTimelyStr) {
+        this.isRepliedTimelyStr = isRepliedTimelyStr;
+    }
+
+    public String getExistVipCourseStr() {
+        return existVipCourseStr;
+    }
+
+    public void setExistVipCourseStr(String existVipCourseStr) {
+        this.existVipCourseStr = existVipCourseStr;
+    }
+
     public Integer getExistVipCourse() {
         return existVipCourse;
     }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1164,12 +1164,14 @@ public class ExportController extends BaseController {
             row.setStatusStr(Objects.isNull(row.getStatus()) || row.getStatus() == 0 ? "否" : "是");
             row.setIsViewStr(Objects.isNull(row.getIsView()) || row.getIsView() == 0 ? "否" : "是");
             row.setIsRepliedStr(Objects.isNull(row.getIsReplied()) || row.getIsReplied() == 0 ? "否" : "是");
+            row.setIsRepliedTimelyStr(Objects.isNull(row.getIsRepliedTimely()) || row.getIsRepliedTimely() == 0 ? "否" : "是");
+            row.setExistVipCourseStr(Objects.isNull(row.getExistVipCourse())|| row.getExistVipCourse()==0?"否":"是");
         }
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生编号", "学生姓名", "提交作业", "提交作业时间", "是否回复", "是否查看"},
-                    new String[]{"createTime", "expireDate", "title", "teacherName", "organName", "user.username","userId", "statusStr","submitTime", "isRepliedStr", "isViewStr"}, rows);
+                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生姓名", "学生编号", "提交作业", "提交作业时间", "是否评价", "是否有vip", "及时评价"},
+                    new String[]{"createTime", "expireDate", "title", "teacherName", "organName", "user.username","userId", "statusStr","submitTime", "isRepliedStr", "existVipCourseStr","isRepliedTimelyStr"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();