jelly 3 years ago
parent
commit
481928c0fc

+ 42 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -80,7 +80,7 @@
         <if test="updateUser != null">
             update_user_ = #{updateUser},
         </if>
-        </set> 
+        </set>
         WHERE id_ = #{id}
 	</update>
 	
@@ -88,6 +88,47 @@
 	<delete id="delete" >
 		DELETE FROM music_album WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="MusicAlbum">
+        delete from music_album
+        where 1=1
+        <if test="albumName != null and albumName != ''">
+            and album_name_ = #{albumName}
+        </if>
+        <if test="albumDesc != null and albumDesc != ''">
+            and album_desc_ = #{albumDesc}
+        </if>
+        <if test="albumTag != null and albumTag != ''">
+            and album_tag_ = #{albumTag}
+        </if>
+        <if test="albumCoverUrl != null and albumCoverUrl != ''">
+            and album_cover_url_ = #{albumCoverUrl}
+        </if>
+        <if test="albumStatus != null and albumStatus != ''">
+            and album_status_ = #{albumStatus}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="hotFlag != null and hotFlag != ''">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="topFlag != null and topFlag != ''">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null and updateUser != ''">
+            and update_user_ = #{updateUser}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">

+ 21 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetAccompanimentMapper.xml

@@ -60,6 +60,26 @@
 	<delete id="delete" >
 		DELETE FROM music_sheet_accompaniment WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="MusicSheetAccompaniment">
+        delete from music_sheet_accompaniment
+        where 1=1
+        <if test="musicId != null and musicId != ''">
+            and music_id_ = #{musicId}
+        </if>
+        <if test="instrument != null and instrument != ''">
+            and instrument_ = #{instrument}
+        </if>
+        <if test="accompanimentUrl != null and accompanimentUrl != ''">
+            and accompaniment_url_ = #{accompanimentUrl}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
@@ -72,8 +92,7 @@
 	</select>
 
     <select id="findList" parameterType="MusicSheetAccompaniment" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
+        select *
         from music_sheet_accompaniment
         where 1=1
         <if test="musicId != null">

+ 232 - 85
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheet" id="MusicSheet">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheet" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="music_name_" property="musicName" />
 		<result column="music_source_" property="musicSource" />
@@ -34,110 +34,181 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicSheet" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM music_sheet WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicSheet">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_sheet ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO music_sheet (id_,music_name_,music_source_,composer_,music_instrument_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,order_no_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,mp3_has_beat_,create_time_,create_user_,update_time_,update_user_,remark_) VALUES(#{id},#{musicName},#{musicSource},#{composer},#{musicInstrument},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{orderNo},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{mp3HasBeat},#{createTime},#{createUser},#{updateTime},#{updateUser},#{remark})
-	</insert>
+        insert into music_sheet
+        (music_name_,music_source_,composer_,music_instrument_,audio_type_,music_tag_,play_speed_,can_evaluate_,show_fingering_,charge_type_,audit_status_,order_no_,top_flag_,hot_flag_,music_price_,audio_file_url_,xml_file_url_,mp3_has_beat_,create_time_,create_user_,update_time_,update_user_,remark_)
+        values
+        (#{musicName},#{musicSource},#{composer},#{musicInstrument},#{audioType},#{musicTag},#{playSpeed},#{canEvaluate},#{showFingering},#{chargeType},#{auditStatus},#{orderNo},#{topFlag},#{hotFlag},#{musicPrice},#{audioFileUrl},#{xmlFileUrl},#{mp3HasBeat},sysdate(),#{createUser},#{updateTime},#{updateUser},#{remark})
+    </insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
-		UPDATE music_sheet <set>
-<if test="auditStatus != null">
-audit_status_ = #{auditStatus},
-</if>
-<if test="musicInstrument != null">
-music_instrument_ = #{musicInstrument},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="topFlag != null">
-top_flag_ = #{topFlag},
-</if>
-<if test="musicPrice != null">
-music_price_ = #{musicPrice},
-</if>
-<if test="createUser != null">
-create_user_ = #{createUser},
-</if>
-<if test="updateUser != null">
-update_user_ = #{updateUser},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="audioType != null">
-audio_type_ = #{audioType},
-</if>
-<if test="canEvaluate != null">
-can_evaluate_ = #{canEvaluate},
-</if>
-<if test="audioFileUrl != null">
-audio_file_url_ = #{audioFileUrl},
-</if>
-<if test="composer != null">
-composer_ = #{composer},
-</if>
-<if test="playSpeed != null">
-play_speed_ = #{playSpeed},
-</if>
-<if test="hotFlag != null">
-hot_flag_ = #{hotFlag},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="musicName != null">
-music_name_ = #{musicName},
-</if>
-<if test="remark != null">
-remark_ = #{remark},
-</if>
-<if test="musicSource != null">
-music_source_ = #{musicSource},
-</if>
-<if test="chargeType != null">
-charge_type_ = #{chargeType},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="mp3HasBeat != null">
-mp3_has_beat_ = #{mp3HasBeat},
-</if>
-<if test="musicTag != null">
-music_tag_ = #{musicTag},
-</if>
-<if test="showFingering != null">
-show_fingering_ = #{showFingering},
-</if>
-<if test="xmlFileUrl != null">
-xml_file_url_ = #{xmlFileUrl},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE music_sheet
+        <set>
+        <if test="musicName != null and musicName != ''">
+            music_name_ = #{musicName},
+        </if>
+        <if test="musicSource != null">
+            music_source_ = #{musicSource},
+        </if>
+        <if test="composer != null and composer != ''">
+            composer_ = #{composer},
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            music_instrument_ = #{musicInstrument},
+        </if>
+        <if test="audioType != null and audioType != ''">
+            audio_type_ = #{audioType},
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            music_tag_ = #{musicTag},
+        </if>
+        <if test="playSpeed != null">
+            play_speed_ = #{playSpeed},
+        </if>
+        <if test="canEvaluate != null">
+            can_evaluate_ = #{canEvaluate},
+        </if>
+        <if test="showFingering != null">
+            show_fingering_ = #{showFingering},
+        </if>
+        <if test="chargeType != null">
+            charge_type_ = #{chargeType},
+        </if>
+        <if test="auditStatus != null">
+            audit_status_ = #{auditStatus},
+        </if>
+        <if test="orderNo != null">
+            order_no_ = #{orderNo},
+        </if>
+        <if test="topFlag != null">
+            top_flag_ = #{topFlag},
+        </if>
+        <if test="hotFlag != null">
+            hot_flag_ = #{hotFlag},
+        </if>
+        <if test="musicPrice != null">
+            music_price_ = #{musicPrice},
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            audio_file_url_ = #{audioFileUrl},
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            xml_file_url_ = #{xmlFileUrl},
+        </if>
+        <if test="mp3HasBeat != null">
+            mp3_has_beat_ = #{mp3HasBeat},
+        </if>
+        <if test="createTime != null">
+            create_time_ = #{createTime},
+        </if>
+        <if test="createUser != null">
+            create_user_ = #{createUser},
+        </if>
+        <if test="updateTime != null">
+            update_time_ = #{updateTime},
+        </if>
+        <if test="updateUser != null">
+            update_user_ = #{updateUser},
+        </if>
+        <if test="remark != null and remark != ''">
+            remark_ = #{remark},
+        </if>
+        </set>
+        WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM music_sheet WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="MusicSheet">
+        delete from music_sheet
+        where 1=1
+        <if test="musicName != null and musicName != ''">
+            and music_name_ = #{musicName}
+        </if>
+        <if test="musicSource != null and musicSource != ''">
+            and music_source_ = #{musicSource}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            and music_instrument_ = #{musicInstrument}
+        </if>
+        <if test="audioType != null and audioType != ''">
+            and audio_type_ = #{audioType}
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            and music_tag_ = #{musicTag}
+        </if>
+        <if test="playSpeed != null and playSpeed != ''">
+            and play_speed_ = #{playSpeed}
+        </if>
+        <if test="canEvaluate != null and canEvaluate != ''">
+            and can_evaluate_ = #{canEvaluate}
+        </if>
+        <if test="showFingering != null and showFingering != ''">
+            and show_fingering_ = #{showFingering}
+        </if>
+        <if test="chargeType != null and chargeType != ''">
+            and charge_type_ = #{chargeType}
+        </if>
+        <if test="auditStatus != null and auditStatus != ''">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="topFlag != null and topFlag != ''">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null and hotFlag != ''">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="musicPrice != null and musicPrice != ''">
+            and music_price_ = #{musicPrice}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            and xml_file_url_ = #{xmlFileUrl}
+        </if>
+        <if test="mp3HasBeat != null and mp3HasBeat != ''">
+            and mp3_has_beat_ = #{mp3HasBeat}
+        </if>
+        <if test="createTime != null and createTime != ''">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null and createUser != ''">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null and updateTime != ''">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null and updateUser != ''">
+            and update_user_ = #{updateUser}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicSheet" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM music_sheet ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
@@ -145,4 +216,80 @@ xml_file_url_ = #{xmlFileUrl},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_sheet
 	</select>
+
+    <select id="findList" parameterType="MusicSheet" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet
+        where 1=1
+        <if test="musicName != null and musicName != ''">
+            and music_name_ = #{musicName}
+        </if>
+        <if test="musicSource != null">
+            and music_source_ = #{musicSource}
+        </if>
+        <if test="composer != null and composer != ''">
+            and composer_ = #{composer}
+        </if>
+        <if test="musicInstrument != null and musicInstrument != ''">
+            and music_instrument_ = #{musicInstrument}
+        </if>
+        <if test="audioType != null and audioType != ''">
+            and audio_type_ = #{audioType}
+        </if>
+        <if test="musicTag != null and musicTag != ''">
+            and music_tag_ = #{musicTag}
+        </if>
+        <if test="playSpeed != null">
+            and play_speed_ = #{playSpeed}
+        </if>
+        <if test="canEvaluate != null">
+            and can_evaluate_ = #{canEvaluate}
+        </if>
+        <if test="showFingering != null">
+            and show_fingering_ = #{showFingering}
+        </if>
+        <if test="chargeType != null">
+            and charge_type_ = #{chargeType}
+        </if>
+        <if test="auditStatus != null">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="orderNo != null">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="topFlag != null">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="musicPrice != null">
+            and music_price_ = #{musicPrice}
+        </if>
+        <if test="audioFileUrl != null and audioFileUrl != ''">
+            and audio_file_url_ = #{audioFileUrl}
+        </if>
+        <if test="xmlFileUrl != null and xmlFileUrl != ''">
+            and xml_file_url_ = #{xmlFileUrl}
+        </if>
+        <if test="mp3HasBeat != null">
+            and mp3_has_beat_ = #{mp3HasBeat}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="createUser != null">
+            and create_user_ = #{createUser}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+        <if test="updateUser != null">
+            and update_user_ = #{updateUser}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark_ = #{remark}
+        </if>
+    </select>
 </mapper>

+ 88 - 37
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetPurchaseRecordMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" id="MusicSheetPurchaseRecord">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="music_sheet_id_" property="musicSheetId" />
 		<result column="teacher_id_" property="teacherId" />
@@ -18,62 +18,85 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="MusicSheetPurchaseRecord" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM music_sheet_purchase_record WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="MusicSheetPurchaseRecord">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM music_sheet_purchase_record ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO music_sheet_purchase_record (id_,music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_) VALUES(#{id},#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
-	</insert>
+        insert into music_sheet_purchase_record
+        (music_sheet_id_,teacher_id_,order_no_,student_id_,purchase_time_,purchase_price_,order_status_)
+        values
+        (#{musicSheetId},#{teacherId},#{orderNo},#{studentId},#{purchaseTime},#{purchasePrice},#{orderStatus})
+    </insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.MusicSheetPurchaseRecord">
-		UPDATE music_sheet_purchase_record <set>
-<if test="musicSheetId != null">
-music_sheet_id_ = #{musicSheetId},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="purchaseTime != null">
-purchase_time_ = #{purchaseTime},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="purchasePrice != null">
-purchase_price_ = #{purchasePrice},
-</if>
-<if test="orderStatus != null">
-order_status_ = #{orderStatus},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE music_sheet_purchase_record
+        <set>
+        <if test="musicSheetId != null">
+            music_sheet_id_ = #{musicSheetId},
+        </if>
+        <if test="teacherId != null">
+            teacher_id_ = #{teacherId},
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            order_no_ = #{orderNo},
+        </if>
+        <if test="studentId != null">
+            student_id_ = #{studentId},
+        </if>
+        <if test="purchaseTime != null">
+            purchase_time_ = #{purchaseTime},
+        </if>
+        <if test="purchasePrice != null">
+            purchase_price_ = #{purchasePrice},
+        </if>
+        <if test="orderStatus != null">
+            order_status_ = #{orderStatus},
+        </if>
+        </set>
+        WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM music_sheet_purchase_record WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="MusicSheetPurchaseRecord">
+        delete from music_sheet_purchase_record
+        where 1=1
+        <if test="musicSheetId != null and musicSheetId != ''">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="teacherId != null and teacherId != ''">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null and purchaseTime != ''">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="purchasePrice != null and purchasePrice != ''">
+            and purchase_price_ = #{purchasePrice}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status_ = #{orderStatus}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="MusicSheetPurchaseRecord" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM music_sheet_purchase_record ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
@@ -81,4 +104,32 @@ order_status_ = #{orderStatus},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_sheet_purchase_record
 	</select>
+
+    <select id="findList" parameterType="MusicSheetPurchaseRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from music_sheet_purchase_record
+        where 1=1
+        <if test="musicSheetId != null">
+            and music_sheet_id_ = #{musicSheetId}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="purchasePrice != null">
+            and purchase_price_ = #{purchasePrice}
+        </if>
+        <if test="orderStatus != null">
+            and order_status_ = #{orderStatus}
+        </if>
+    </select>
 </mapper>

+ 51 - 24
cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentFavoriteAlbumMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.StudentFavoriteAlbumDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" id="StudentFavoriteAlbum">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="student_id_" property="studentId" />
 		<result column="album_id_" property="albumId" />
@@ -14,50 +14,61 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentFavoriteAlbum" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM student_favorite_album WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentFavoriteAlbum">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM student_favorite_album ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_favorite_album (id_,student_id_,album_id_,favorite_time_) VALUES(#{id},#{studentId},#{albumId},#{favoriteTime})
+        insert into student_favorite_album
+        (student_id_,album_id_,favorite_time_)
+        values
+        (#{studentId},#{albumId},#{favoriteTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteAlbum">
-		UPDATE student_favorite_album <set>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="albumId != null">
-album_id_ = #{albumId},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="favoriteTime != null">
-favorite_time_ = #{favoriteTime},
-</if>
-</set> WHERE id_ = #{id} 
+		UPDATE student_favorite_album
+        <set>
+        <if test="studentId != null">
+            student_id_ = #{studentId},
+        </if>
+        <if test="albumId != null">
+            album_id_ = #{albumId},
+        </if>
+        <if test="favoriteTime != null">
+            favorite_time_ = #{favoriteTime},
+        </if>
+        </set>
+        WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM student_favorite_album WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="StudentFavoriteAlbum">
+        delete from student_favorite_album
+        where 1=1
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="albumId != null and albumId != ''">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentFavoriteAlbum" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM student_favorite_album ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
@@ -65,4 +76,20 @@ favorite_time_ = #{favoriteTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_favorite_album
 	</select>
+
+    <select id="findList" parameterType="StudentFavoriteAlbum" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from student_favorite_album
+        where 1=1
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="albumId != null">
+            and album_id_ = #{albumId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </select>
 </mapper>

+ 51 - 24
cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentFavoriteMusicMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.StudentFavoriteMusicDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" id="StudentFavoriteMusic">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="student_id_" property="studentId" />
 		<result column="sheet_id_" property="sheetId" />
@@ -14,50 +14,61 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="StudentFavoriteMusic" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM student_favorite_music WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="StudentFavoriteMusic">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM student_favorite_music ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO student_favorite_music (id_,student_id_,sheet_id_,favorite_time_) VALUES(#{id},#{studentId},#{sheetId},#{favoriteTime})
+        insert into student_favorite_music
+        (student_id_,sheet_id_,favorite_time_)
+        values
+        (#{studentId},#{sheetId},#{favoriteTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.StudentFavoriteMusic">
-		UPDATE student_favorite_music <set>
-<if test="sheetId != null">
-sheet_id_ = #{sheetId},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="favoriteTime != null">
-favorite_time_ = #{favoriteTime},
-</if>
-</set> WHERE id_ = #{id} 
+        update student_favorite_music
+        <set>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="sheetId != null">
+                sheet_id_ = #{sheetId},
+            </if>
+            <if test="favoriteTime != null">
+                favorite_time_ = #{favoriteTime},
+            </if>
+        </set>
+        where id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM student_favorite_music WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="StudentFavoriteMusic">
+        delete from student_favorite_music
+        where 1=1
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="sheetId != null and sheetId != ''">
+            and sheet_id_ = #{sheetId}
+        </if>
+        <if test="favoriteTime != null and favoriteTime != ''">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="StudentFavoriteMusic" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM student_favorite_music ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
@@ -65,4 +76,20 @@ favorite_time_ = #{favoriteTime},
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM student_favorite_music
 	</select>
+
+    <select id="findList" parameterType="StudentFavoriteMusic" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from student_favorite_music
+        where 1=1
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="sheetId != null">
+            and sheet_id_ = #{sheetId}
+        </if>
+        <if test="favoriteTime != null">
+            and favorite_time_ = #{favoriteTime}
+        </if>
+    </select>
 </mapper>

+ 76 - 45
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonDetailMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonDetailDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" id="VideoLessonDetail">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="lesson_id_" property="lessonId" />
 		<result column="lesson_title_" property="lessonTitle" />
@@ -20,60 +20,91 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VideoLessonDetail" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM video_lesson_detail WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="VideoLessonDetail">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_detail ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO video_lesson_detail (id_,lesson_id_,lesson_title_,lesson_content_,video_url_,cover_url_,order_num_,teacher_id_,create_time_,update_time_) VALUES(#{id},#{lessonId},#{lessonTitle},#{lessonContent},#{videoUrl},#{coverUrl},#{orderNum},#{teacherId},#{createTime},#{updateTime})
-	</insert>
+        insert into video_lesson_detail
+        (lesson_id_,lesson_title_,lesson_content_,video_url_,cover_url_,order_num_,teacher_id_,create_time_,update_time_)
+        values
+        (#{lessonId},#{lessonTitle},#{lessonContent},#{videoUrl},#{coverUrl},#{orderNum},#{teacherId},sysdate(),#{updateTime})
+    </insert>
 	
 	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonDetail">
-		UPDATE video_lesson_detail <set>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="coverUrl != null">
-cover_url_ = #{coverUrl},
-</if>
-<if test="videoUrl != null">
-video_url_ = #{videoUrl},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="lessonId != null">
-lesson_id_ = #{lessonId},
-</if>
-<if test="orderNum != null">
-order_num_ = #{orderNum},
-</if>
-<if test="lessonTitle != null">
-lesson_title_ = #{lessonTitle},
-</if>
-<if test="lessonContent != null">
-lesson_content_ = #{lessonContent},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
+    <update id="update" parameterType="VideoLessonDetail">
+        update video_lesson_detail
+        <set>
+            <if test="lessonId != null">
+                lesson_id_ = #{lessonId},
+            </if>
+            <if test="lessonTitle != null and lessonTitle != ''">
+                lesson_title_ = #{lessonTitle},
+            </if>
+            <if test="lessonContent != null and lessonContent != ''">
+                lesson_content_ = #{lessonContent},
+            </if>
+            <if test="videoUrl != null and videoUrl != ''">
+                video_url_ = #{videoUrl},
+            </if>
+            <if test="coverUrl != null and coverUrl != ''">
+                cover_url_ = #{coverUrl},
+            </if>
+            <if test="orderNum != null">
+                order_num_ = #{orderNum},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonDetail" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_detail
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="lessonTitle != null and lessonTitle != ''">
+            and lesson_title_ = #{lessonTitle}
+        </if>
+        <if test="lessonContent != null and lessonContent != ''">
+            and lesson_content_ = #{lessonContent}
+        </if>
+        <if test="videoUrl != null and videoUrl != ''">
+            and video_url_ = #{videoUrl}
+        </if>
+        <if test="coverUrl != null and coverUrl != ''">
+            and cover_url_ = #{coverUrl}
+        </if>
+        <if test="orderNum != null">
+            and order_num_ = #{orderNum}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -81,7 +112,7 @@ create_time_ = #{createTime},
 	</delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VideoLessonDetail" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM video_lesson_detail ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

+ 65 - 33
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonEvaluateMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonEvaluateDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" id="VideoLessonEvaluate">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="video_item_id_" property="videoItemId" />
 		<result column="student_id_" property="studentId" />
@@ -15,53 +15,85 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VideoLessonEvaluate" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM video_lesson_evaluate WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="VideoLessonEvaluate">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_evaluate ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO video_lesson_evaluate (id_,video_item_id_,student_id_,content_,evaluate_time_) VALUES(#{id},#{videoItemId},#{studentId},#{content},#{evaluateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonEvaluate">
-		UPDATE video_lesson_evaluate <set>
-<if test="evaluateTime != null">
-evaluate_time_ = #{evaluateTime},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="videoItemId != null">
-video_item_id_ = #{videoItemId},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="content != null">
-content_ = #{content},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
+    <insert id="insert" parameterType="VideoLessonEvaluate">
+        insert into video_lesson_evaluate
+        (video_item_id_,student_id_,content_,evaluate_time_)
+        values
+        (#{videoItemId},#{studentId},#{content},#{evaluateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonEvaluate">
+        update video_lesson_evaluate
+        <set>
+            <if test="videoItemId != null">
+                video_item_id_ = #{videoItemId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="content != null and content != ''">
+                content_ = #{content},
+            </if>
+            <if test="evaluateTime != null">
+                evaluate_time_ = #{evaluateTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonEvaluate" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_evaluate
+        where 1=1
+        <if test="videoItemId != null">
+            and video_item_id_ = #{videoItemId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="content != null and content != ''">
+            and content_ = #{content}
+        </if>
+        <if test="evaluateTime != null">
+            and evaluate_time_ = #{evaluateTime}
+        </if>
+    </select>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM video_lesson_evaluate WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="VideoLessonEvaluate">
+        delete from video_lesson_evaluate
+        where 1=1
+        <if test="videoItemId != null and videoItemId != ''">
+            and video_item_id_ = #{videoItemId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="content != null and content != ''">
+            and content_ = #{content}
+        </if>
+        <if test="evaluateTime != null and evaluateTime != ''">
+            and evaluate_time_ = #{evaluateTime}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VideoLessonEvaluate" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM video_lesson_evaluate ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

+ 108 - 63
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLesson" id="VideoLesson">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLesson" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="lesson_name_" property="lessonName" />
 		<result column="lesson_instrument_" property="lessonInstrument" />
@@ -25,75 +25,120 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VideoLesson" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM video_lesson WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="VideoLesson">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLesson" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO video_lesson (id_,lesson_name_,lesson_instrument_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,order_no_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_) VALUES(#{id},#{lessonName},#{lessonInstrument},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{orderNo},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLesson">
-		UPDATE video_lesson <set>
-<if test="lessonCount != null">
-lesson_count_ = #{lessonCount},
-</if>
-<if test="auditStatus != null">
-audit_status_ = #{auditStatus},
-</if>
-<if test="lessonDesc != null">
-lesson_desc_ = #{lessonDesc},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="topFlag != null">
-top_flag_ = #{topFlag},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="lessonCoverUrl != null">
-lesson_cover_url_ = #{lessonCoverUrl},
-</if>
-<if test="hotFlag != null">
-hot_flag_ = #{hotFlag},
-</if>
-<if test="createTime != null">
-create_time_ = #{createTime},
-</if>
-<if test="teacherId != null">
-teacher_id_ = #{teacherId},
-</if>
-<if test="lessonPrice != null">
-lesson_price_ = #{lessonPrice},
-</if>
-<if test="updateTime != null">
-update_time_ = #{updateTime},
-</if>
-<if test="lessonInstrument != null">
-lesson_instrument_ = #{lessonInstrument},
-</if>
-<if test="lessonName != null">
-lesson_name_ = #{lessonName},
-</if>
-<if test="lessonTag != null">
-lesson_tag_ = #{lessonTag},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
+    <insert id="insert" parameterType="VideoLesson">
+        insert into video_lesson
+        (lesson_name_,lesson_instrument_,lesson_desc_,lesson_price_,lesson_cover_url_,teacher_id_,lesson_count_,order_no_,lesson_tag_,top_flag_,hot_flag_,audit_status_,create_time_,update_time_)
+        values
+        (#{lessonName},#{lessonInstrument},#{lessonDesc},#{lessonPrice},#{lessonCoverUrl},#{teacherId},#{lessonCount},#{orderNo},#{lessonTag},#{topFlag},#{hotFlag},#{auditStatus},sysdate(),#{updateTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLesson">
+        update video_lesson
+        <set>
+            <if test="lessonName != null and lessonName != ''">
+                lesson_name_ = #{lessonName},
+            </if>
+            <if test="lessonInstrument != null and lessonInstrument != ''">
+                lesson_instrument_ = #{lessonInstrument},
+            </if>
+            <if test="lessonDesc != null and lessonDesc != ''">
+                lesson_desc_ = #{lessonDesc},
+            </if>
+            <if test="lessonPrice != null">
+                lesson_price_ = #{lessonPrice},
+            </if>
+            <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+                lesson_cover_url_ = #{lessonCoverUrl},
+            </if>
+            <if test="teacherId != null">
+                teacher_id_ = #{teacherId},
+            </if>
+            <if test="lessonCount != null">
+                lesson_count_ = #{lessonCount},
+            </if>
+            <if test="orderNo != null">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="lessonTag != null and lessonTag != ''">
+                lesson_tag_ = #{lessonTag},
+            </if>
+            <if test="topFlag != null">
+                top_flag_ = #{topFlag},
+            </if>
+            <if test="hotFlag != null">
+                hot_flag_ = #{hotFlag},
+            </if>
+            <if test="auditStatus != null">
+                audit_status_ = #{auditStatus},
+            </if>
+            <if test="createTime != null">
+                create_time_ = #{createTime},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = #{updateTime},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLesson" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson
+        where 1=1
+        <if test="lessonName != null and lessonName != ''">
+            and lesson_name_ = #{lessonName}
+        </if>
+        <if test="lessonInstrument != null and lessonInstrument != ''">
+            and lesson_instrument_ = #{lessonInstrument}
+        </if>
+        <if test="lessonDesc != null and lessonDesc != ''">
+            and lesson_desc_ = #{lessonDesc}
+        </if>
+        <if test="lessonPrice != null">
+            and lesson_price_ = #{lessonPrice}
+        </if>
+        <if test="lessonCoverUrl != null and lessonCoverUrl != ''">
+            and lesson_cover_url_ = #{lessonCoverUrl}
+        </if>
+        <if test="teacherId != null">
+            and teacher_id_ = #{teacherId}
+        </if>
+        <if test="lessonCount != null">
+            and lesson_count_ = #{lessonCount}
+        </if>
+        <if test="orderNo != null">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="lessonTag != null and lessonTag != ''">
+            and lesson_tag_ = #{lessonTag}
+        </if>
+        <if test="topFlag != null">
+            and top_flag_ = #{topFlag}
+        </if>
+        <if test="hotFlag != null">
+            and hot_flag_ = #{hotFlag}
+        </if>
+        <if test="auditStatus != null">
+            and audit_status_ = #{auditStatus}
+        </if>
+        <if test="createTime != null">
+            and create_time_ = #{createTime}
+        </if>
+        <if test="updateTime != null">
+            and update_time_ = #{updateTime}
+        </if>
+    </select>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -101,7 +146,7 @@ lesson_tag_ = #{lessonTag},
 	</delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VideoLesson" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM video_lesson ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

+ 83 - 39
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonPurchaseRecordMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonPurchaseRecordDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="VideoLessonPurchaseRecord">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="lesson_id_" property="lessonId" />
 		<result column="student_id_" property="studentId" />
@@ -17,59 +17,103 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VideoLessonPurchaseRecord" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM video_lesson_purchase_record WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="VideoLessonPurchaseRecord">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_purchase_record ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO video_lesson_purchase_record (id_,lesson_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_) VALUES(#{id},#{lessonId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonPurchaseRecord">
-		UPDATE video_lesson_purchase_record <set>
-<if test="purchaseTime != null">
-purchase_time_ = #{purchaseTime},
-</if>
-<if test="orderNo != null">
-order_no_ = #{orderNo},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="lessonId != null">
-lesson_id_ = #{lessonId},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="payMoney != null">
-pay_money_ = #{payMoney},
-</if>
-<if test="orderStatus != null">
-order_status_ = #{orderStatus},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
+    <insert id="insert" parameterType="VideoLessonPurchaseRecord">
+        insert into video_lesson_purchase_record
+        (lesson_id_,student_id_,purchase_time_,pay_money_,order_no_,order_status_)
+        values
+        (#{lessonId},#{studentId},#{purchaseTime},#{payMoney},#{orderNo},#{orderStatus})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonPurchaseRecord">
+        update video_lesson_purchase_record
+        <set>
+            <if test="lessonId != null">
+                lesson_id_ = #{lessonId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="purchaseTime != null">
+                purchase_time_ = #{purchaseTime},
+            </if>
+            <if test="payMoney != null">
+                pay_money_ = #{payMoney},
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                order_no_ = #{orderNo},
+            </if>
+            <if test="orderStatus != null">
+                order_status_ = #{orderStatus},
+            </if>
+        </set>
+        where id_ = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonPurchaseRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_purchase_record
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="payMoney != null">
+            and pay_money_ = #{payMoney}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="orderStatus != null">
+            and order_status_ = #{orderStatus}
+        </if>
+    </select>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
 		DELETE FROM video_lesson_purchase_record WHERE id_ = #{id} 
 	</delete>
+
+    <delete id="delete" parameterType="VideoLessonPurchaseRecord">
+        delete from video_lesson_purchase_record
+        where 1=1
+        <if test="lessonId != null and lessonId != ''">
+            and lesson_id_ = #{lessonId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="purchaseTime != null and purchaseTime != ''">
+            and purchase_time_ = #{purchaseTime}
+        </if>
+        <if test="payMoney != null and payMoney != ''">
+            and pay_money_ = #{payMoney}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and order_no_ = #{orderNo}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status_ = #{orderStatus}
+        </if>
+    </delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VideoLessonPurchaseRecord" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM video_lesson_purchase_record ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

+ 84 - 41
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonStudyRecordMapper.xml

@@ -6,7 +6,7 @@
 -->
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.VideoLessonStudyRecordDao">
 	
-	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" id="VideoLessonStudyRecord">
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" id="BaseResultMap">
 		<result column="id_" property="id" />
 		<result column="lesson_id" property="lessonId" />
 		<result column="video_id_" property="videoId" />
@@ -17,51 +17,94 @@
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="VideoLessonStudyRecord" >
+	<select id="get" resultMap="BaseResultMap" >
 		SELECT * FROM video_lesson_study_record WHERE id_ = #{id} 
 	</select>
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="VideoLessonStudyRecord">
+	<select id="findAll" resultMap="BaseResultMap">
 		SELECT * FROM video_lesson_study_record ORDER BY id_
 	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO video_lesson_study_record (id_,lesson_id,video_id_,student_id_,lesson_finished_,start_time_,finish_time_) VALUES(#{id},#{lessonId},#{videoId},#{studentId},#{lessonFinished},#{startTime},#{finishTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.VideoLessonStudyRecord">
-		UPDATE video_lesson_study_record <set>
-<if test="finishTime != null">
-finish_time_ = #{finishTime},
-</if>
-<if test="id != null">
-id_ = #{id},
-</if>
-<if test="lessonFinished != null">
-lesson_finished_ = #{lessonFinished},
-</if>
-<if test="videoId != null">
-video_id_ = #{videoId},
-</if>
-<if test="studentId != null">
-student_id_ = #{studentId},
-</if>
-<if test="lessonId != null">
-lesson_id = #{lessonId},
-</if>
-<if test="startTime != null">
-start_time_ = #{startTime},
-</if>
-</set> WHERE id_ = #{id} 
-	</update>
+
+    <delete id="delete" parameterType="VideoLessonStudyRecord">
+        delete from video_lesson_study_record
+        where 1=1
+        <if test="lessonId != null and lessonId != ''">
+            and lesson_id = #{lessonId}
+        </if>
+        <if test="videoId != null and videoId != ''">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null and studentId != ''">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="lessonFinished != null and lessonFinished != ''">
+            and lesson_finished_ = #{lessonFinished}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and start_time_ = #{startTime}
+        </if>
+        <if test="finishTime != null and finishTime != ''">
+            and finish_time_ = #{finishTime}
+        </if>
+    </delete>
+
+    <insert id="insert" parameterType="VideoLessonStudyRecord">
+        insert into video_lesson_study_record
+        (lesson_id,video_id_,student_id_,lesson_finished_,start_time_,finish_time_)
+        values
+        (#{lessonId},#{videoId},#{studentId},#{lessonFinished},#{startTime},#{finishTime})
+    </insert>
+
+    <update id="update" parameterType="VideoLessonStudyRecord">
+        update video_lesson_study_record
+        <set>
+            <if test="lessonId != null">
+                lesson_id = #{lessonId},
+            </if>
+            <if test="videoId != null">
+                video_id_ = #{videoId},
+            </if>
+            <if test="studentId != null">
+                student_id_ = #{studentId},
+            </if>
+            <if test="lessonFinished != null">
+                lesson_finished_ = #{lessonFinished},
+            </if>
+            <if test="startTime != null">
+                start_time_ = #{startTime},
+            </if>
+            <if test="finishTime != null">
+                finish_time_ = #{finishTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <select id="findList" parameterType="VideoLessonStudyRecord" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from video_lesson_study_record
+        where 1=1
+        <if test="lessonId != null">
+            and lesson_id = #{lessonId}
+        </if>
+        <if test="videoId != null">
+            and video_id_ = #{videoId}
+        </if>
+        <if test="studentId != null">
+            and student_id_ = #{studentId}
+        </if>
+        <if test="lessonFinished != null">
+            and lesson_finished_ = #{lessonFinished}
+        </if>
+        <if test="startTime != null">
+            and start_time_ = #{startTime}
+        </if>
+        <if test="finishTime != null">
+            and finish_time_ = #{finishTime}
+        </if>
+    </select>
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -69,7 +112,7 @@ start_time_ = #{startTime},
 	</delete>
 	
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="VideoLessonStudyRecord" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		SELECT * FROM video_lesson_study_record ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	

+ 4 - 9
toolset/codegen/src/main/resources/template/sqlmap.ftl

@@ -7,7 +7,7 @@
 -->
 <mapper namespace="${namespace}">
 	
-	<resultMap type="${fullClassName}" id="${alias}">
+	<resultMap type="${fullClassName}" id="BaseResultMap">
 	[#list columns as col]
 		<result column="${col.fieldName}" property="${col.propertyName}" />
 	[/#list]
@@ -15,23 +15,18 @@
 	
 	[#if querySingleSQL??]
 	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="${alias}" [#if paramType??]parameterType="${paramType}"[/#if]>
+	<select id="get" resultMap="BaseResultMap" [#if paramType??]parameterType="${paramType}"[/#if]>
 		${querySingleSQL}
 	</select>
 	[/#if]
 	
 	<!-- 全查询 -->
-	<select id="findAll" resultMap="${alias}">
+	<select id="findAll" resultMap="BaseResultMap">
 		${queryFullSQL}
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="${fullClassName}" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		${insertSQL}
 	</insert>
 	
@@ -51,7 +46,7 @@
 	
 	[#if queryPage??]
 	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="${alias}" parameterType="map">
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
 		${queryPage}
 	</select>
 	[/#if]