Merge branch 'zx_saas_homework_1011' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/student/controller/open/OpenLessonExaminationController.java

@@ -0,0 +1,98 @@
+package com.ym.mec.student.controller.open;
+
+
+import com.ym.mec.biz.dal.dto.CourseHomeworkWrapper;
+import com.ym.mec.biz.dal.dto.LessonExaminationResultDto;
+import com.ym.mec.biz.dal.dto.StudentLessonExaminationDto;
+import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
+import com.ym.mec.biz.dal.entity.StudentCourseHomework;
+import com.ym.mec.biz.dal.entity.Subject;
+import com.ym.mec.biz.dal.enums.ELessonTrainingType;
+import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
+import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Api(tags = "进度评测表")
+@RestController
+@RequestMapping("${app-config.url.student:}/open/")
+public class OpenLessonExaminationController extends BaseController {
+
+    @Resource
+    private LessonExaminationService lessonExaminationService;
+    @Resource
+    private StudentLessonExaminationService studentLessonExaminationService;
+    @Resource
+    private CourseHomeworkService courseHomeworkService;
+    @Resource
+    private StudentCourseHomeworkService studentCourseHomeworkService;
+    @Resource
+    private SubjectService subjectService;
+
+    @ApiOperation(value = "获取学员列表")
+    @PostMapping("studentLessonExamination/queryPage")
+    public HttpResponseResult<PageInfo<StudentLessonExaminationDto>> queryPage(@RequestBody StudentLessonExaminationQueryInfo queryInfo) {
+        return succeed(studentLessonExaminationService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "获取单个作业")
+    @GetMapping("lessonExamination/getOne")
+    public HttpResponseResult<LessonExaminationResultDto> queryPage(Long lessonExaminationId) {
+        LessonExaminationQueryInfo queryInfo = new LessonExaminationQueryInfo();
+        queryInfo.setLessonExaminationId(lessonExaminationId);
+        LessonExaminationResultDto resultDto = lessonExaminationService.queryPage(queryInfo).getRows().get(0);
+        return succeed(resultDto);
+    }
+
+    @ApiOperation(value = "获取作业详情")
+    @GetMapping(value = "courseHomework/findCourseHomeworkDetail")
+    public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findCourseHomeworkDetail(Integer courseScheduleId, ELessonTrainingType type){
+        if (ELessonTrainingType.HOMEWORK.equals(type)) {
+
+            return succeed(courseHomeworkService.findCourseHomeworkDetail(courseScheduleId));
+        } else {
+            return succeed(courseHomeworkService.findCourseExtraHomeworkDetail(courseScheduleId));
+        }
+    }
+
+    @ApiOperation(value = "根据课程计划获取需要交作业的学生声部-公用")
+    @PostMapping("findCourseStudentsSubjectPublic/v2")
+    public HttpResponseResult<List<Subject>> findCourseStudentsSubjectPublicV2(@Validated @RequestBody StudentLessonTrainingDetailWrapper.StudentLessonTrainingQuery query){
+        List<StudentCourseHomework> studentCourseHomeworkByCourseV2;
+        if(ELessonTrainingType.HOMEWORK.equals(query.getType())){
+            if (Objects.isNull(query.getCourseScheduleId())) {
+                throw new BizException("请指定课程");
+            }
+            studentCourseHomeworkByCourseV2 = studentCourseHomeworkService.findStudentCourseHomeworkByCourseV2(
+                    query);
+        }else{
+            studentCourseHomeworkByCourseV2 = studentCourseHomeworkService.findExtraExerciseStudentsV2(query);
+        }
+
+        if (CollectionUtils.isEmpty(studentCourseHomeworkByCourseV2)) {
+            return succeed(new ArrayList<>());
+        }
+        // 获取声部
+        List<Integer> collect = studentCourseHomeworkByCourseV2.stream().map(StudentCourseHomework::getSubjectId).collect(
+                Collectors.toList());
+
+        return succeed(subjectService.findBySubjectByIdList(collect));
+
+    }
+
+}
+

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

@@ -111,6 +111,8 @@ public class StudentLessonTrainingDetailWrapper {
 
         @ApiModelProperty("资源是否有效")
         private Boolean validFlag = false;
+
+        private String memo;
         
         public String jsonString() {
             return JSON.toJSONString(this);

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

@@ -50,6 +50,4 @@ public class StudentServiceDetailDto {
     private String attachments;
 
     private String musicScoreId;
-
-    private String memo;
 }

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

@@ -19,8 +19,6 @@ public class StudentServiceHomeworkDto {
 
     private Integer isReplied;
 
-    private String memo;
-
     private Integer isRepliedTimely;
 
     private Integer isView;

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

@@ -295,8 +295,8 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
         query.setCourseScheduleId(extraId);
         query.setPage(1);
         query.setRows(1);
-        PageInfo<CourseHomeworkWrapper.CourseHomeworkList> courseHomeworkListPageInfo = studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(
-            query);
+        PageInfo<CourseHomeworkWrapper.CourseHomeworkList> courseHomeworkListPageInfo =
+				studentExtracurricularExercisesSituationService.queryTeacherExtraHomeworkDetailV2(query);
         List<CourseHomeworkWrapper.CourseHomeworkList> rows = courseHomeworkListPageInfo.getRows();
         if (CollectionUtils.isEmpty(rows)) {
             throw new BizException("作业不存在");

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

@@ -14,7 +14,6 @@
 		<result column="username_" property="user.username" />
 		<result column="attachments_" property="attachments" />
 		<result column="create_time_" property="createTime" />
-		<result column="memo_" property="memo" />
 		<result column="update_time_" property="updateTime" />
 		<result column="remark_" property="remark" />
 		<result column="status_" property="status" />
@@ -36,7 +35,6 @@
 		<result column="teacher_name_" property="teacherName"/>
 		<result column="avatar_" property="headUrl"/>
 		<result column="phone_" property="phone"/>
-		<result column="memo_" property="memo"/>
 		<result column="title_" property="title"/>
 		<result column="content_" property="content"/>
 		<result column="expire_date_" property="expireDate"/>
@@ -103,21 +101,21 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,create_time_,
 		                                             update_time_,remark_,status_,is_replied_,is_view_,is_replied_timely_,
-		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
+		                                             music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES(#{extracurricularExercisesId},#{userId},#{attachments},NOW(),NOW(),#{remark},#{status},#{isReplied},#{isView},
-		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag},#{memo})
+		       #{isRepliedTimely},#{musicScoreId},#{musicScoreContent},#{tenantId},#{standardFlag})
 	</insert>
 
 	<insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.ExtracurricularExercisesReply" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO extracurricular_exercises_reply (extracurricular_exercises_id_,user_id_,attachments_,
 		                                             create_time_,update_time_,remark_,status_,is_replied_,is_view_,
-		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_,memo_)
+		                                             is_replied_timely_,music_score_id_,music_score_content_,tenant_id_,standard_flag_)
 		VALUES
 		<foreach collection="replies" item="reply" separator=",">
 			(#{reply.extracurricularExercisesId},#{reply.userId},#{reply.attachments},NOW(),NOW(),
 			 #{reply.remark},#{reply.status},#{reply.isReplied},#{reply.isView},#{reply.isRepliedTimely},
 			 #{reply.musicScoreId},#{reply.musicScoreContent},#{replay.tenantId},
-			 #{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{reply.memo})
+			 #{replay.standardFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
 		</foreach>
 	</insert>
 
@@ -146,9 +144,6 @@
 			<if test="remark != null">
 			remark_ = #{remark},
 			</if>
-			<if test="memo != null">
-				memo_ = #{memo},
-			</if>
 			<if test="id != null">
 			id_ = #{id},
 			</if>
@@ -407,7 +402,6 @@
 		<result column="id_" property="id" />
 		<result column="user_id_" property="userId" />
 		<result column="status_" property="status" />
-		<result column="memo_" property="memo" />
 		<result column="is_replied_" property="isReplied" />
 		<result column="is_replied_timely_" property="isRepliedTimely" />
 		<result column="is_view_" property="isView" />
@@ -423,7 +417,6 @@
 			eer.submit_time_,
 			eer.is_replied_,
 			eer.is_replied_timely_,
-			eer.memo_,
 			'EXTRA' type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -437,7 +430,6 @@
 			sch.submit_time_,
 			sch.is_replied_,
 			sch.is_replied_timely_,
-			sch.memo_,
 			'HOMEWORK' type_
 		FROM
 			student_course_homework sch
@@ -466,7 +458,6 @@
 		<result property="isReplied" column="is_replied_"/>
 		<result property="attachments" column="attachments_"/>
 		<result property="musicScoreId" column="music_score_id_"/>
-		<result property="memo" column="memo_"/>
 	</resultMap>
 
 	<select id="findStudentHomeworkDetailsInTimeZone" resultMap="StudentServiceDetailDto">
@@ -489,7 +480,6 @@
 			eer.attachments_,
 			eer.submit_time_,
 			eer.is_replied_,
-			eer.memo_,
 			'EXTRA' homework_type_
 		FROM
 			extracurricular_exercises_reply eer
@@ -517,7 +507,6 @@
 			sch.attachments_,
 			sch.submit_time_,
 			sch.is_replied_,
-			sch.memo_,
 			'HOMEWORK' homework_type_
 		FROM
 			student_course_homework sch
@@ -558,7 +547,6 @@
 			eer.is_replied_timely_,
 			ee.teacher_id_ ee_teacher_id_,
 			eer.music_score_id_,
-			eer.memo_,
 			ee.music_group_id_ ee_music_group_id_
 		FROM
 			extracurricular_exercises_reply eer
@@ -607,8 +595,7 @@
 			COUNT( eer.user_id_ ) exceptStudentNum,
 			SUM( eer.status_ ) submitStudentNum,
 			SUM( eer.is_replied_ ) repliedStudentNum,
-			eer.music_score_id_ musicScoreId,
-			eer.memo_ memo
+			eer.music_score_id_ musicScoreId
 		FROM
 			extracurricular_exercises ee
 			LEFT JOIN sys_user su ON ee.teacher_id_ = su.id_

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -41,7 +41,7 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-        syncSaveLog(request, handler);
+//        syncSaveLog(request, handler);
     }
 
     public void syncSaveLog(HttpServletRequest request, Object handler) {