Merge branch 'feature/1106_homework' into dev

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

@@ -119,6 +119,8 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
 
     List<StudentCourseHomework> findStudentCourseHomeworkByCourseV2(StudentLessonTrainingDetailWrapper.StudentLessonTrainingQuery query);
 
+    void studentLessonTrainingDetailFileJsonFormat(ELessonTrainingType type, Long homeworkId, List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails);
+
     void studentLessonTrainingDetailFileJsonFormat(List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails, Date expireDate, Integer fileExpireDay);
 
     List<StudentCourseHomework> findExtraExerciseStudentsV2(StudentLessonTrainingDetailWrapper.StudentLessonTrainingQuery query);

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

@@ -274,7 +274,6 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
         List<CourseHomeworkWrapper.StudentLessonTrainingStat> trainingStatList =  studentLessonTrainingDetailService
                 .getLessonTrainingStat(courseHomeworkList.getCourseHomeworkId(), ELessonTrainingType.HOMEWORK);
 
-        studentCourseHomeworkService.studentLessonTrainingDetailFileJsonFormat(baseLessonTrainingDetail, courseHomeworkList.getExpiryDate(), courseHomeworkList.getFileExpireDay());
 
 
         courseHomeworkList.setTrainingGroupList(trainingStatList);

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

@@ -828,22 +828,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         StudentCourseHomework studentCourseHomework = studentCourseHomeworkByCourse.get(0);
         List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails = studentCourseHomeworkDao
             .findByStudentIdsAndCourseScheduleId(studentIds, studentCourseHomework.getCourseHomeworkId(),studentCourseHomework.getType());
-        Date expireDate = null;
-        Integer fileExpireDay = null;
-        if (studentCourseHomework.getType() == ELessonTrainingType.HOMEWORK) {
-            CourseHomework courseHomework = courseHomeworkDao.get(studentCourseHomework.getCourseHomeworkId());
-            if (courseHomework != null) {
-                expireDate = courseHomework.getExpiryDate();
-                fileExpireDay = courseHomework.getFileExpireDay();
-            }
-        } else {
-            ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(studentCourseHomework.getCourseHomeworkId());
-            if (extracurricularExercises != null) {
-                expireDate = extracurricularExercises.getExpireDate();
-                fileExpireDay = extracurricularExercises.getFileExpireDay();
-            }
-        }
-        studentLessonTrainingDetailFileJsonFormat(studentLessonTrainingDetails,expireDate,fileExpireDay);
+        studentLessonTrainingDetailFileJsonFormat(studentCourseHomework.getType(), studentCourseHomework.getCourseHomeworkId(), studentLessonTrainingDetails);
 
         if (CollectionUtils.isNotEmpty(studentLessonTrainingDetails)) {
             //设置曲目名称
@@ -867,6 +852,26 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
     }
 
     @Override
+    public void studentLessonTrainingDetailFileJsonFormat(ELessonTrainingType type, Long homeworkId, List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails) {
+        Date expireDate = null;
+        Integer fileExpireDay = null;
+        if (type == ELessonTrainingType.HOMEWORK) {
+            CourseHomework courseHomework = courseHomeworkDao.get(homeworkId);
+            if (courseHomework != null) {
+                expireDate = courseHomework.getExpiryDate();
+                fileExpireDay = courseHomework.getFileExpireDay();
+            }
+        } else {
+            ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(homeworkId);
+            if (extracurricularExercises != null) {
+                expireDate = extracurricularExercises.getExpireDate();
+                fileExpireDay = extracurricularExercises.getFileExpireDay();
+            }
+        }
+        studentLessonTrainingDetailFileJsonFormat(studentLessonTrainingDetails, expireDate, fileExpireDay);
+    }
+
+    @Override
     public void studentLessonTrainingDetailFileJsonFormat(List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetails, Date expireDate, Integer fileExpireDay) {
 
 
@@ -878,6 +883,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             if (StringUtils.isNotBlank(studentLessonTrainingDetail.getFileJsons())) {
                 List<CourseHomeworkWrapper.FileJson> fileJsons = JSON.parseArray(studentLessonTrainingDetail.getFileJsons(), CourseHomeworkWrapper.FileJson.class);
                 studentLessonTrainingDetail.setFileJson(fileJsons);
+                studentLessonTrainingDetail.setFileJsons(null);
             }
             if (!CollectionUtils.isEmpty(studentLessonTrainingDetail.getFileJson())) {
                 for (CourseHomeworkWrapper.FileJson fileJson : studentLessonTrainingDetail.getFileJson()) {
@@ -1129,22 +1135,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             .findByStudentIdsAndCourseScheduleId(Collections.singletonList(userId.intValue()), homeworkId, type);
 
 
-        Date expireDate = null;
-        Integer fileExpireDay = null;
-        if (type == ELessonTrainingType.HOMEWORK) {
-            CourseHomework courseHomework = courseHomeworkDao.get(homeworkId);
-            if (courseHomework != null) {
-                expireDate = courseHomework.getExpiryDate();
-                fileExpireDay = courseHomework.getFileExpireDay();
-            }
-        } else {
-            ExtracurricularExercises extracurricularExercises = extracurricularExercisesDao.get(homeworkId);
-            if (extracurricularExercises != null) {
-                expireDate = extracurricularExercises.getExpireDate();
-                fileExpireDay = extracurricularExercises.getFileExpireDay();
-            }
-        }
-        studentLessonTrainingDetailFileJsonFormat(studentLessonTrainingDetails,expireDate,fileExpireDay);
+        studentLessonTrainingDetailFileJsonFormat(type, homeworkId, studentLessonTrainingDetails);
 
         studentLessonTraining.setStudentLessonTrainingDetail(studentLessonTrainingDetails);
         return studentLessonTraining;

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

@@ -64,6 +64,9 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
 
     @Autowired
     private MemberRankCourseTypeMapperService memberRankCourseTypeMapperService;
+
+    @Autowired
+    private StudentCourseHomeworkService studentCourseHomeworkService;
     /**
      * 查询详情
      * @param id 详情ID
@@ -185,6 +188,7 @@ public class StudentLessonTrainingDetailServiceImpl extends ServiceImpl<StudentL
                 studentLessonTrainingDetail.setFileJson(JSON.parseArray(fileJson, CourseHomeworkWrapper.FileJson.class));
                 return studentLessonTrainingDetail;
             }).collect(Collectors.toList());
+        studentCourseHomeworkService.studentLessonTrainingDetailFileJsonFormat(type,courseHomeworkId,studentLessonTrainingDetails);
 
         //更新曲目名称
         this.updateMusicScoreName(studentLessonTrainingDetails);