Merge remote-tracking branch 'origin/feature_HW_20230331' into feature_HW_20230331

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

@@ -56,6 +56,16 @@ public class ExtraExerciseStudentsDto extends ExtracurricularExercisesReply {
     @ApiModelProperty(value = "作业类型")
     private String type;
 
+    private String subjectId;
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
     public String getType() {
         return type;
     }

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

@@ -70,6 +70,17 @@ public class StudentHomeworkRecordDto {
     @ApiModelProperty("完成状态 false 未完成 true 已完成")
     private Boolean finishStatus;
 
+    @ApiModelProperty("提交时间")
+    private Date submitTime;
+
+    public Date getSubmitTime() {
+        return submitTime;
+    }
+
+    public void setSubmitTime(Date submitTime) {
+        this.submitTime = submitTime;
+    }
+
     public StandardEnum getStandardFlag() {
         return standardFlag;
     }

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

@@ -76,10 +76,6 @@ public class StudentLessonTrainingDetailWrapper {
         public String jsonString() {
             return JSON.toJSONString(this);
         }
-
-        public static StudentLessonTrainingDetail from(String json) {
-            return JSON.parseObject(json, StudentLessonTrainingDetail.class);
-        }
 	}
 
 
@@ -106,21 +102,12 @@ public class StudentLessonTrainingDetailWrapper {
         @ApiModelProperty(value = "true:完成 false未完成",hidden = true)
         private Boolean standardFlag;
 
-
-
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
-
-        public static StudentLessonTrainingDetail from(String json) {
-            return JSON.parseObject(json, StudentLessonTrainingDetail.class);
-        }
 	}
 
 
 
     @Data
-    @ApiModel(" StudentLessonTrainingQuery-学生练习内容查询对象")
+    @ApiModel(" StudentLessonTraining-学生练习内容查询对象")
     public static class StudentLessonTraining {
 
 
@@ -150,11 +137,6 @@ public class StudentLessonTrainingDetailWrapper {
 
         @ApiModelProperty(value = "练习内容")
         private List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> studentLessonTrainingDetail;
-
-        public String jsonString() {
-            return JSON.toJSONString(this);
-        }
-
     }
 
 }

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

@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
+import com.ym.mec.biz.service.CourseHomeworkService;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -71,6 +72,9 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
     @Autowired
     private ExtracurricularExercisesService extracurricularExercisesService;
 
+    @Autowired
+    private CourseHomeworkService courseHomeworkService;
+
 	@Override
 	public BaseDAO<Long, ExtracurricularExercisesReply> getDAO() {
 		return extracurricularExercisesReplyDao;
@@ -92,6 +96,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 		for (ExtraExerciseStudentsDto extraExerciseStudent : extraExerciseStudents) {
 			StudentCourseHomework studentCourseHomework=new StudentCourseHomework();
 			studentCourseHomework.setId(extraExerciseStudent.getId());
+            studentCourseHomework.setCourseHomeworkId(extraExerciseId);
+            studentCourseHomework.setCourseScheduleId(extraExerciseId);
 			studentCourseHomework.setUserId(extraExerciseStudent.getUserId());
 			studentCourseHomework.setUserName(extraExerciseStudent.getStudentName());
 			studentCourseHomework.setStatus(extraExerciseStudent.getStatus()==0?YesOrNoEnum.NO:YesOrNoEnum.YES);
@@ -311,6 +317,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
             studentHomeworkRecordDto.setMusicGroupId(row.getMusicGroupId());
             studentHomeworkRecordDto.setClassGroupId(row.getClassGroupId());
             studentHomeworkRecordDto.setType(ELessonTrainingType.valueOf(row.getType()));
+            studentHomeworkRecordDto.setSubmitTime(row.getSubmitTime());
             recordDtoList.add(studentHomeworkRecordDto);
         }
 
@@ -360,6 +367,9 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
             } else {
                 studentHomeworkRecordDto.setFinishStatus(true);
             }
+
+            // 设置提交时间
+
         }
 
         PageInfo<StudentHomeworkRecordDto> pageInfo = new PageInfo<>(studentExtraExercises.getPageNo(),studentExtraExercises.getLimit());
@@ -370,19 +380,8 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 
     @Override
     public CourseHomeworkWrapper.CourseHomeworkList findStudentExtraExerciseDetailV2(Long studentExerciseId) {
-        ExtraExercilseQueryInfo queryInfo = new ExtraExercilseQueryInfo();
-        queryInfo.setPage(1);
-        queryInfo.setRows(1);
-        queryInfo.setStudentExerciseId(studentExerciseId);
-        PageInfo<ExtracurricularExercises> extracurricularExercisesReplyPageInfo = extracurricularExercisesService.queryPage(queryInfo);
-        if (CollectionUtils.isEmpty(extracurricularExercisesReplyPageInfo.getRows())) {
-            throw new BizException("课外训练不存在");
-        }
-        ExtracurricularExercises extracurricularExercises = extracurricularExercisesReplyPageInfo.getRows().get(0);
-
-
 
-        return null;
+        return courseHomeworkService.findCourseExtraHomeworkDetail( studentExerciseId.intValue());
 
 
     }

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

@@ -32,6 +32,7 @@ import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -141,7 +142,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                     studentExtraExercise.setUserId(userId);
                     studentExtraExercise.setMusicScoreId(StringUtils.join(musicScoreSubjectDto.getMusicScoreIdList(),","));
                     studentExtraExercise.setMusicScoreContent(JSONObject.toJSONString(musicScoreSubjectDto.getMusicScoreHomeworkDtoList()));
-                    extracurricularExercisesReplies.add(ObjectUtils.clone(studentExtraExercise));
+                    extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));
                 }
                 // 作业详情
                 studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
@@ -152,14 +153,17 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
         } else {
             for (Integer studentId : studentIds) {
                 studentExtraExercise.setUserId(studentId);
-                extracurricularExercisesReplies.add(ObjectUtils.clone(studentExtraExercise));
+                extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));
+
             }
             // 作业详情
             studentLessonTrainingDetailList.addAll(studentLessonTrainingDetailService
                                                        .homeWorkDetail(exercises.getStudentLessonTrainingDetails(), studentIds,exercises.getId(),
                                                        ELessonTrainingType.valueOf(exercises.getGroupType())));
         }
-        extracurricularExercisesReplyDao.batchInsert(extracurricularExercisesReplies);
+        for (ExtracurricularExercisesReply extracurricularExercisesReply : extracurricularExercisesReplies) {
+            extracurricularExercisesReplyDao.insert(extracurricularExercisesReply);
+        }
         if (!CollectionUtils.isEmpty(studentLessonTrainingDetailList)) {
             studentLessonTrainingDetailService.saveBatch(studentLessonTrainingDetailList);
             exercises.setVersionTag("v2");

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

@@ -868,9 +868,6 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                                                          .filter(o -> o.getSubjectId().equals(query.getSubjectId()))
                                                          .collect(Collectors.toList());
         }
-        for (StudentCourseHomework studentCourseHomework : extraExerciseStudents) {
-            studentCourseHomework.setType(ELessonTrainingType.EXTRACURRICULAR);
-        }
         return getStudentCourseHomeworks(extraExerciseStudents);
     }
 

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

@@ -804,7 +804,6 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
             }
             for (CourseHomeworkWrapper.CourseHomeworkList courseHomeworkList : courseHomeworkLists) {
 
-                courseHomeworkList.setType(ELessonTrainingType.HOMEWORK);
                 // 乐团信息
                 MusicGroup musicGroup = musicGroupMap.get(courseHomeworkList.getMusicGroupId());
                 if (Objects.nonNull(musicGroup)) {
@@ -822,12 +821,24 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 if (StringUtils.isEmpty(courseHomeworkList.getMusicGroupId()) && courseHomeworkList.getClassGroupId() == null) {
                     String studentIdList = courseHomeworkList.getStudentIdList();
                     if (StringUtils.isNotBlank(studentIdList)) {
+
                         String[] split = studentIdList.split(",");
                         String userId = split[0];
                         SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
-                        courseHomeworkList.setMusicGroupName(sysUser.getUsername() + "等"+split.length+"名学员");
+                        if (split.length == 1) {
+                            courseHomeworkList.setMusicGroupName(sysUser.getUsername());
+                        } else {
+                            courseHomeworkList.setMusicGroupName(sysUser.getUsername() + "等" + split.length + "名学员");
+                        }
                     }
                 }
+
+                // 设置老师信息
+                SysUser sysUser = sysUserFeignService.queryUserById(courseHomeworkList.getTeacherId());
+                if (Objects.nonNull(sysUser)) {
+                    courseHomeworkList.setTeacherName(sysUser.getUsername());
+                    courseHomeworkList.setTeacherImg(sysUser.getAvatar());
+                }
             }
 
             pageInfo.setRows(courseHomeworkLists);

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

@@ -135,6 +135,9 @@
 			<if test="completedNum != null">
 			completed_num_ = #{completedNum},
 			</if>
+            <if test="versionTag != null and versionTag != ''">
+                version_tag_ = #{versionTag},
+            </if>
 			update_time_ = NOW()
 		</set> WHERE id_ = #{id} and tenant_id_ = #{tenantId}
 	</update>
@@ -388,7 +391,8 @@
             null as finishNum,
             null as assignTime,
             null as expiryDate,
-            null as studentIdList
+            null as studentIdList,
+            null as teacherId
             from music_group
             where id_ in
             <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
@@ -408,7 +412,8 @@
         completed_num_ as finishNum,
         create_time_ as assignTime,
         expire_date_ as expiryDate,
-        student_id_list_ as studentIdList
+        student_id_list_ as studentIdList,
+        teacher_id_ as teacherId
         from extracurricular_exercises
         <where>
 

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

@@ -262,7 +262,8 @@
 		</where>
 	</sql>
 	<select id="countStudentExtraExercises" resultType="int">
-		SELECT COUNT(id_) FROM extracurricular_exercises_reply eer
+		SELECT COUNT(eer.id_) FROM extracurricular_exercises_reply eer
+        left join extracurricular_exercises ee on eer.extracurricular_exercises_id_ = ee.id_
 		<include refid="queryStudentExtraExercisesCondition"/>
 	</select>
 	<select id="findStudentExtraExercises" resultMap="ExtraExerciseStudentsDto">
@@ -274,7 +275,7 @@
         ee.group_type_  as `type`,
             ee.id_ as extracurricularExercisesId,
             ee.music_group_id_ as musicGroupId,
-            eer.class_group_id_ as classGroupId,
+        ee.class_group_id_ as classGroupId,
 			tea.real_name_ teacher_name_,
 			tea.avatar_,
 			su.username_ student_name_

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

@@ -368,6 +368,7 @@
         <result property="musicGroupId" column="musicGroupId"/>
         <result property="classGroupId" column="classGroupId"/>
         <result property="teachMode" column="teachMode"/>
+        <result property="submitTime" column="submitTime"/>
         <result property="standardFlag" column="standardFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="findStudentHomeworkRecord" resultMap="StudentHomeworkRecordDto">
@@ -379,6 +380,7 @@
         CONCAT(cs.class_date_,' ',cs.end_class_time_) endClassTime,
         cs.actual_teacher_id_,
         sch.status_,
+        sch.submit_time_ as submitTime,
         sch.standard_flag_ as standardFlag,
         ch.expiry_date_,
         su.real_name_,

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -111,7 +111,7 @@ public class StudentCourseHomeworkController extends BaseController {
 
     @ApiOperation(value = "获取学生作业记录")
     @GetMapping(value = "/findStudentHomeworkRecord/v2")
-    public HttpResponseResult<PageInfo<StudentHomeworkRecordDto>> findStudentHomeworkRecordV2(CourseHomeworkQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<StudentHomeworkRecordDto>> findStudentHomeworkRecordV2( CourseHomeworkQueryInfo queryInfo){
         queryInfo.setUserId(sysUserService.getUserId().longValue());
         queryInfo.setVersionTag("v2");
         return succeed(studentCourseHomeworkService.findStudentHomeworkRecord(queryInfo));

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ExtracurricularExercises;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherServeHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherServeQueryInfo;
@@ -117,6 +118,7 @@ public class ExtracurricularExercisesController extends BaseController {
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
         exercises.setTeacherId(sysUser.getId());
+        exercises.setGroupType(ELessonTrainingType.EXTRACURRICULAR.getCode());
         extracurricularExercisesService.createExtraExercises(exercises);
         return succeed();
     }
@@ -135,6 +137,7 @@ public class ExtracurricularExercisesController extends BaseController {
             exercises.setExpireDate(instance.getTime());
         }
 
+        exercises.setGroupType(ELessonTrainingType.EXTRA.getCode());
         exercises.setTeacherId(sysUser.getId());
         extracurricularExercisesService.createExtraExercises(exercises);
         return succeed();