Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamMusicTheoryMapper.xml

@@ -4,9 +4,9 @@
 这个文件是自动生成的。
 不要修改此文件。所有改动将在下次重新自动生成时丢失。
 -->
-<mapper namespace="com.keao.edu.datasource.dal.dao.ExamMusicTheoryDao">
+<mapper namespace="com.keao.edu.user.dao.ExamMusicTheoryDao">
 	
-	<resultMap type="com.keao.edu.datasource.dal.entity.ExamMusicTheory" id="ExamMusicTheory">
+	<resultMap type="com.keao.edu.user.entity.ExamMusicTheory" id="ExamMusicTheory">
 		<result column="id_" property="id" />
 		<result column="examination_basic_id_" property="examinationBasicId" />
 		<result column="level_" property="level" />
@@ -27,40 +27,35 @@
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.keao.edu.datasource.dal.entity.ExamMusicTheory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamMusicTheory" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		<!--
 		<selectKey resultClass="int" keyProperty="id" > 
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO exam_music_theory (id_,examination_basic_id_,level_,fee_,tenant_id_,create_time_,update_time_) VALUES(#{id},#{examinationBasicId},#{level},#{fee},#{tenantId},#{createTime},#{updateTime})
+		INSERT INTO exam_music_theory (id_,examination_basic_id_,level_,fee_,tenant_id_,create_time_,update_time_)
+		VALUES(#{id},#{examinationBasicId},#{level},#{fee},#{tenantId},NOW(),NOW())
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.keao.edu.datasource.dal.entity.ExamMusicTheory">
+	<update id="update" parameterType="com.keao.edu.user.entity.ExamMusicTheory">
 		UPDATE exam_music_theory <set>
-<if test="examinationBasicId != null">
-examination_basic_id_ = #{examinationBasicId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="fee != null">
-fee_ = #{fee},
-</if>
-<if test="tenantId != null">
-tenant_id_ = #{tenantId},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="level != null">
-level_ = #{level},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
+		<if test="examinationBasicId != null">
+		examination_basic_id_ = #{examinationBasicId},
+		</if>
+		<if test="fee != null">
+		fee_ = #{fee},
+		</if>
+		<if test="tenantId != null">
+		tenant_id_ = #{tenantId},
+		</if>
+		<if test="updateTime != null">
+		update_time_ = #{updateTime},
+		</if>
+		<if test="level != null">
+		level_ = #{level},
+		</if>
+		</set> WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->