Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -102,6 +102,15 @@ public class CourseReviewDto {
     @ApiModelProperty(value = "学生id",required = false)
     private Integer studentId;
 
+    @ApiModelProperty(value = "发音Str",required = false)
+    private String pronunciationStr;
+
+    @ApiModelProperty(value = "节奏Str",required = false)
+    private String tempoStr;
+
+    @ApiModelProperty(value = "乐理Str",required = false)
+    private String musicTheoryStr;
+
     public Integer getOrganId() {
         return organId;
     }
@@ -357,4 +366,28 @@ public class CourseReviewDto {
     public void setStudentId(Integer studentId) {
         this.studentId = studentId;
     }
+
+    public String getPronunciationStr() {
+        return pronunciationStr;
+    }
+
+    public void setPronunciationStr(String pronunciationStr) {
+        this.pronunciationStr = pronunciationStr;
+    }
+
+    public String getTempoStr() {
+        return tempoStr;
+    }
+
+    public void setTempoStr(String tempoStr) {
+        this.tempoStr = tempoStr;
+    }
+
+    public String getMusicTheoryStr() {
+        return musicTheoryStr;
+    }
+
+    public void setMusicTheoryStr(String musicTheoryStr) {
+        this.musicTheoryStr = musicTheoryStr;
+    }
 }

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020/3/8
@@ -18,6 +20,26 @@ public class GroupCourseTimesDto {
 
     private Integer surplusClassTimes;
 
+    private Date startDate;
+
+    private Date endDate;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     public String getGroupId() {
         return groupId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CoursesGroupServiceImpl.java

@@ -254,11 +254,11 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 groupCard.setGroupType(GroupType.COMM);
                 groupCard.setName(teacherCourseGroup.getName());
                 groupCard.setSingleClassMinutes(teacherCourseGroup.getSingleClassMinutes());
-                groupCard.setCoursesStartDate(teacherCourseGroup.getCoursesStartDate());
-                groupCard.setCoursesEndDate(teacherCourseGroup.getCoursesEndDate());
                 groupCard.setSubjectId(teacherCourseGroup.getSubjectId());
                 groupCard.setSubjectName(idSubjectMap.get(teacherCourseGroup.getSubjectId()).getName());
                 GroupCourseTimesDto groupCourseTimesInfo = groupCourseTimesInfoMap.get(String.valueOf(teacherCourseGroup.getId()));
+                groupCard.setCoursesStartDate(groupCourseTimesInfo.getStartDate());
+                groupCard.setCoursesEndDate(groupCourseTimesInfo.getEndDate());
                 groupCard.setClassGroupId(groupCourseTimesInfo.getClassGroupId());
                 groupCard.setTotalCourseTimes(groupCourseTimesInfo.getTotalCourseTimes());
                 groupCard.setSurplusClassTimes(groupCourseTimesInfo.getSurplusClassTimes());

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

@@ -2774,6 +2774,8 @@
         <result property="classGroupId" column="class_group_id_"/>
         <result property="totalCourseTimes" column="total_course_times_"/>
         <result property="surplusClassTimes" column="surplus_class_times_"/>
+        <result property="startDate" column="start_date_"/>
+        <result property="endDate" column="end_date_"/>
     </resultMap>
 
     <select id="findGroupsCourseTimesInfo" resultMap="GroupCourseTimesDto">
@@ -2782,7 +2784,9 @@
             cg.group_type_,
             cg.id_ class_group_id_,
             cg.total_class_times_ total_course_times_,
-            COUNT( cs.id_ ) surplus_class_times_
+            COUNT( cs.id_ ) surplus_class_times_,
+            MIN( CONCAT( class_date_, ' ', start_class_time_ ) ) start_date_,
+            MAX( CONCAT( class_date_, ' ', end_class_time_ ) ) end_date_
         FROM
             course_schedule cs
             LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_

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

@@ -663,10 +663,20 @@ public class ExportController extends BaseController {
                 if (row.getCreateTime() != null) {
                     row.setCreateTimeStr(DateUtil.dateToString(row.getCreateTime(), "yyyy-MM-dd"));
                 }
+                if(row.getPronunciation() != null){
+                    row.setPronunciationStr(row.getPronunciation()+"星");
+                }
+                if(row.getTempo() != null){
+                    row.setTempoStr(row.getTempo()+"星");
+                }
+                if(row.getMusicTheory() != null){
+                    row.setMusicTheoryStr(row.getMusicTheory()+"星");
+                }
+
             }
 
             String[] header = {"分部", "上课日期", "学生编号", "课程班名称", "老师", "教材内容", "发音", "节奏", "乐理", "曲目", "评价备注", "回访日期（布置作业）", "完成app双向沟通", "是否提交作业", "教务老师", "教务评价"};
-            String[] body = {"organName", "classDateStr", "studentId", "courseName", "teacherName", "teachingMaterial", "pronunciation", "tempo", "musicTheory", "song", "memo", "createTimeStr", "hasLiaison", "handHomeworkStr", "eduTeacherName", "courseReview"};
+            String[] body = {"organName", "classDateStr", "studentId", "courseName", "teacherName", "teachingMaterial", "pronunciationStr", "tempoStr", "musicTheoryStr", "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");