Merge remote-tracking branch 'origin/master'

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

@@ -72,6 +72,36 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "是否提交作业备注",required = false)
     private String handHomeworkStr;
 
+    @ApiModelProperty(value = "教材内容",required = false)
+    private String teachingMaterial;
+
+    @ApiModelProperty(value = "发音",required = false)
+    private Integer pronunciation;
+
+    @ApiModelProperty(value = "节奏",required = false)
+    private Integer tempo;
+
+    @ApiModelProperty(value = "乐理",required = false)
+    private Integer musicTheory;
+
+    @ApiModelProperty(value = "曲目",required = false)
+    private String song;
+
+    @ApiModelProperty(value = "评价备注",required = false)
+    private String memo;
+
+    @ApiModelProperty(value = "回访日期",required = false)
+    private Date createTime;
+
+    @ApiModelProperty(value = "回访日期Str",required = false)
+    private String createTimeStr;
+
+    @ApiModelProperty(value = "完成app双向沟通",required = false)
+    private String hasLiaison;
+
+    @ApiModelProperty(value = "学生id",required = false)
+    private Integer studentId;
+
     public Integer getOrganId() {
         return organId;
     }
@@ -247,4 +277,84 @@ public class CourseReviewDto {
     public void setHandHomeworkStr(String handHomeworkStr) {
         this.handHomeworkStr = handHomeworkStr;
     }
+
+    public String getTeachingMaterial() {
+        return teachingMaterial;
+    }
+
+    public void setTeachingMaterial(String teachingMaterial) {
+        this.teachingMaterial = teachingMaterial;
+    }
+
+    public Integer getPronunciation() {
+        return pronunciation;
+    }
+
+    public void setPronunciation(Integer pronunciation) {
+        this.pronunciation = pronunciation;
+    }
+
+    public Integer getTempo() {
+        return tempo;
+    }
+
+    public void setTempo(Integer tempo) {
+        this.tempo = tempo;
+    }
+
+    public Integer getMusicTheory() {
+        return musicTheory;
+    }
+
+    public void setMusicTheory(Integer musicTheory) {
+        this.musicTheory = musicTheory;
+    }
+
+    public String getSong() {
+        return song;
+    }
+
+    public void setSong(String song) {
+        this.song = song;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
+
+    public String getHasLiaison() {
+        return hasLiaison;
+    }
+
+    public void setHasLiaison(String hasLiaison) {
+        this.hasLiaison = hasLiaison;
+    }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleReviewMapper.xml

@@ -143,6 +143,15 @@
         <result column="class_date_Str_" jdbcType="VARCHAR" property="classDateStr"/>
         <result column="start_class_time_Str_" jdbcType="VARCHAR" property="startClassTimeStr"/>
         <result column="end_class_time_Str_" jdbcType="VARCHAR" property="endClassTimeStr"/>
+        <result column="teaching_material_" property="teachingMaterial"/>
+        <result column="pronunciation_" property="pronunciation"/>
+        <result column="tempo_" property="tempo"/>
+        <result column="music_theory_" property="musicTheory"/>
+        <result column="song_" property="song"/>
+        <result column="memo_" property="memo"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="has_liaison_" property="hasLiaison"/>
+        <result column="student_id_" property="studentId"/>
     </resultMap>
 
     <sql id="practiceGroupReviewsQueryCondition">
@@ -207,7 +216,8 @@
         course_name_,su.real_name_
         teacher_name_,edsu.real_name_
         edu_teacher_name_,pg.buy_months_,csr.id_ review_id_, csc.score_
-        student_review_,csr.hand_homework_,csr.course_review_
+        student_review_,csr.hand_homework_,csr.course_review_,pg.student_id_,csr.teaching_material_,csr.pronunciation_,csr.tempo_,
+        csr.music_theory_,csr.song_,csr.memo_,csr.create_time_,csr.has_liaison_
         FROM course_schedule cs
         LEFT JOIN practice_group pg ON cs.music_group_id_ = pg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_

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

@@ -75,54 +75,4 @@ public class CourseReviewController extends BaseController {
         return succeed(courseReviewService.getReviewInfo(id));
     }
 
-
-    @ApiOperation(value = "评论列表导出")
-    @RequestMapping("export")
-    @PreAuthorize("@pcs.hasPermissions('courseReview/export')")
-    public void export(CourseReviewQueryInfo queryInfo, HttpServletResponse response) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (!sysUser.getIsSuperAdmin()) {
-            Employee employee = employeeDao.get(sysUser.getId());
-                queryInfo.setOrganId(employee.getOrganIdList());
-        }
-        queryInfo.setRows(99999);
-        PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.findPracticeGroupReviews(queryInfo);
-        try {
-            for (CourseReviewDto row : practiceGroupReviews.getRows()) {
-                row.setClassDateStr(DateUtil.dateToString(row.getClassDate(),"yyyy-MM-dd"));
-                if(row.getBuyMonths() >0){
-                    row.setStartClassTimeStr("收费");
-                }else {
-                    row.setStartClassTimeStr("免费");
-                }
-                if(row.getReviewId() > 0){
-                    row.setEndClassTimeStr("是");
-                }else {
-                    row.setEndClassTimeStr("否");
-                }
-                if(row.getReviewId() > 0){
-                    row.setEndClassTimeStr("是");
-                }else {
-                    row.setEndClassTimeStr("否");
-                }
-                if(row.getHandHomework() > 0){
-                    row.setHandHomeworkStr("是");
-                }else {
-                    row.setHandHomeworkStr("否");
-                }
-            }
-
-            String[] header = {"分部名称", "课程编号","课程日期","课程名称", "声部", "指导老师", "教务老师", "收费类型", "学员评分", "完成评价", "提交作业", "教务评价"};
-            String[] body = {"organName","id","classDateStr","courseName", "subjectName", "teacherName", "eduTeacherName", "startClassTimeStr", "studentReview", "endClassTimeStr", "handHomeworkStr", "courseReview"};
-            HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
-            response.setContentType("application/octet-stream");
-            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
-            response.flushBuffer();
-            workbook.write(response.getOutputStream());
-            workbook.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
 }

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

@@ -68,6 +68,8 @@ public class ExportController extends BaseController {
     private SporadicChargeInfoService sporadicChargeInfoService;
     @Autowired
     private PracticeGroupDao practiceGroupDao;
+    @Autowired
+    private CourseReviewService courseReviewService;
 
     @ApiOperation(value = "导出老师课酬")
     @PostMapping("export/teacherSalary")
@@ -625,4 +627,50 @@ public class ExportController extends BaseController {
             e.printStackTrace();
         }
     }
+
+    @ApiOperation(value = "评论列表导出")
+    @RequestMapping("export/courseReviews")
+    @PreAuthorize("@pcs.hasPermissions('export/courseReviews')")
+    public void export(CourseReviewQueryInfo queryInfo, HttpServletResponse response) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeDao.get(sysUser.getId());
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }
+        queryInfo.setRows(99999);
+        PageInfo<CourseReviewDto> practiceGroupReviews = courseReviewService.findPracticeGroupReviews(queryInfo);
+        if(practiceGroupReviews.getTotal() <= 0){
+            response.setStatus(404);
+            return;
+        }
+        try {
+            for (CourseReviewDto row : practiceGroupReviews.getRows()) {
+                row.setClassDateStr(DateUtil.dateToString(row.getClassDate(), "yyyy-MM-dd"));
+                if (row.getHandHomework() != null && row.getHandHomework() > 0) {
+                    row.setHandHomeworkStr("是");
+                } else {
+                    row.setHandHomeworkStr("否");
+                }
+                if (row.getHasLiaison() != null && row.getHasLiaison().equals("1")) {
+                    row.setHasLiaison("是");
+                } else {
+                    row.setHasLiaison("否");
+                }
+                if (row.getCreateTime() != null) {
+                    row.setCreateTimeStr(DateUtil.dateToString(row.getCreateTime(), "yyyy-MM-dd"));
+                }
+            }
+
+            String[] header = {"分部", "上课日期", "学生编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业", "教务老师", "教务评价"};
+            String[] body = {"organName", "classDateStr", "studentId", "courseName", "teacherName", "teachingMaterial", "pronunciation", "tempo", "musicTheory", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "eduTeacherName", "courseReview"};
+            HSSFWorkbook workbook = POIUtil.exportExcel(header, body, practiceGroupReviews.getRows());
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            workbook.write(response.getOutputStream());
+            workbook.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }