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

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

@@ -254,6 +254,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty("作业来源分类")
         private String groupType;
 
+
+        private String type;
+
         /** 批次号 */
         @ApiModelProperty(value="批次号")
         private String batchNo;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -3,12 +3,14 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
+import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -94,6 +96,8 @@ public class ExtracurricularExercises extends BaseEntity {
 
 	private List<MusicScoreSubjectDto> musicScoreSubjectDtos;
 
+    @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
+    private String type;
 
     @ApiModelProperty("乐团名")
     private String musicGroupName;
@@ -108,6 +112,14 @@ public class ExtracurricularExercises extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getVersionTag() {
         return versionTag;
     }

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

@@ -369,6 +369,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
             }
 
             // 设置提交时间
+            studentHomeworkRecordDto.setCourseScheduleId(studentHomeworkRecordDto.getStudentCourseHomeworkId().longValue());
 
         }
 

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

@@ -4180,7 +4180,7 @@
                 and cs.id_ = #{param.courseScheduleId}
             </if>
             <if test="param.versionTag !=null">
-                and ch.version_tag_ = #{param.versionTag}
+                and (ch.version_tag_ = #{param.versionTag} or ch.version_tag_ is null)
             </if>
 
             <if test="param.teacherId != null">
@@ -4229,7 +4229,7 @@
                 and cs.id_ = #{param.courseScheduleId}
             </if>
             <if test="param.versionTag !=null">
-                and ch.version_tag_ = #{param.versionTag}
+                and (ch.version_tag_ = #{param.versionTag} or ch.version_tag_ is null)
             </if>
         </where>
     </select>

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

@@ -28,6 +28,7 @@
 		<result column="assignTime" property="assignTime" />
 		<result column="musicGroupName" property="musicGroupName" />
 		<result column="versionTag" property="versionTag" />
+		<result column="type" property="type" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -149,7 +150,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
+		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.group_type_ as type,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
 		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_
 		     ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_,ee.create_time_ as assignTime,mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId,ee.version_tag_ as versionTag
 		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_