Parcourir la source

新增训练说明

zouxuan il y a 5 mois
Parent
commit
084e2f9e55

+ 0 - 2
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;
 }

+ 0 - 2
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;

+ 2 - 2
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("作业不存在");

+ 5 - 18
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_

+ 1 - 1
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) {