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

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

@@ -80,6 +80,9 @@ public class TeacherClassGroupDto {
     @ApiModelProperty(value = "开课时间")
     private Date courseStartDate;
 
+    @ApiModelProperty(value = "陪练报告URL")
+    private String studyReportUrl;
+
     public Date getCourseStartDate() {
         return courseStartDate;
     }
@@ -263,4 +266,12 @@ public class TeacherClassGroupDto {
     public void setThreeClassNoAttendanceStudentNum(Integer threeClassNoAttendanceStudentNum) {
         this.threeClassNoAttendanceStudentNum = threeClassNoAttendanceStudentNum;
     }
+
+    public String getStudyReportUrl() {
+        return studyReportUrl;
+    }
+
+    public void setStudyReportUrl(String studyReportUrl) {
+        this.studyReportUrl = studyReportUrl;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -4,8 +4,8 @@ import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysConfigService extends BaseService<Long, SysConfig> {
-	
-	public static final String BASE_API_URL = "base_api_url";
+
+    public static final String BASE_API_URL = "base_api_url";
 
     /**
      * 缴费状态提前{}天刷新
@@ -32,7 +32,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      */
     public static final String ADVANCE_LEAVE_HOURS = "advance_leave_hours";
 
-   String ENABLE_TEACHER_COURSE_ADJUST_DEFAULT_HOURS = "enable_teacher_course_adjust_default_hours";
+    String ENABLE_TEACHER_COURSE_ADJUST_DEFAULT_HOURS = "enable_teacher_course_adjust_default_hours";
 
     /**
      * 单技课梯度结算规则设置
@@ -126,7 +126,7 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
      * @describe 教师请假数据
      */
     String TEACHER_LEAVE_DATA = "teacher_leave_data";
-    
+
     /**
      * 十分钟内最大可发送的短信次数
      */
@@ -153,6 +153,16 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String PRACTICE_BUY_ACTIVITY_EXPIRE_DATE = "practice_buy_activity_expire_date";
 
     /**
+     * 陪练老师端入口地址
+     */
+    String TEACHER_STUDY_REPORT_URL = "teacher_study_report_url";
+
+    /**
+     * 陪练课学生地址
+     */
+    String STUDENT_STUDY_REPORT_URL = "student_study_report_url";
+
+    /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName
      * @describe 根据配置名称获取配置信息

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

@@ -970,6 +970,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 teacherClassGroupDto.setSubjectNames(StringUtils.join(subjectNameList, ","));
             }
+            //剩余课程为显示陪练报告入口rul
+            if(teacherClassGroupDto.getType() == ClassGroupTypeEnum.PRACTICE){
+               if(teacherClassGroupDto.getSurplusClassTimes().equals(0)){
+                   String studyReportUrl = sysConfigDao.findConfigValue(SysConfigService.TEACHER_STUDY_REPORT_URL);
+                   teacherClassGroupDto.setStudyReportUrl(studyReportUrl+teacherClassGroupDto.getClassGroupId());
+               }
+            }
         });
 
         return teacherMusicClassGroup;