Joburgess 5 years ago
parent
commit
222da71575

+ 6 - 3
mec-biz/src/main/resources/config/mybatis/CourseHomeworkMapper.xml

@@ -18,7 +18,7 @@
 		<result column="class_group_id_" property="classGroupId" />
 		<result column="completed_num_" property="completedNum" />
 		<result column="expect_num_" property="expectNum" />
-		<result column="next_class_date_" property="expiryDate" />
+		<result column="expiry_date_" property="expiryDate" />
 	</resultMap>
 
 	<resultMap type="com.ym.mec.biz.dal.dto.CourseHomeworkListDto" id="CourseHomeworkDto">
@@ -33,7 +33,7 @@
 		<result column="class_group_name_" property="classGroupName" />
 		<result column="completed_num_" property="completedNum" />
 		<result column="expect_num_" property="expectNum" />
-		<result column="next_class_date_" property="expiryDate" />
+		<result column="expiry_date_" property="expiryDate" />
 		<result column="remark_" property="remark" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="is_replied_" property="isReplied" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
@@ -61,7 +61,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_homework (id_,group_type_,course_schedule_id_,attachments_,content_,create_time_,update_time_,music_group_id_,class_group_id_,completed_num_,expect_num_) VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseScheduleId},#{attachments},#{content},now(),now(),#{musicGroupId},#{classGroupId},#{completedNum},#{expectNum})
+		INSERT INTO course_homework (id_,group_type_,course_schedule_id_,attachments_,content_,create_time_,update_time_,music_group_id_,class_group_id_,completed_num_,expect_num_,expiry_date_) VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseScheduleId},#{attachments},#{content},now(),now(),#{musicGroupId},#{classGroupId},#{completedNum},#{expectNum},#{expiryDate})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -101,6 +101,9 @@
 		<if test="createTime != null">
 		create_time_ = #{createTime},
 		</if>
+		<if test="expiryDate != null">
+			expiry_date_ = #{expiryDate},
+		</if>
 		</set> WHERE id_ = #{id}
 	</update>
 	

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

@@ -204,6 +204,7 @@
 			ch.expiry_date_,
 			ch.completed_num_,
 			ch.expect_num_,
+			ch.expiry_date_,
 			sch.attachments_,
 			sch.score_,
 			sch.status_,