Merge remote-tracking branch 'origin/master'

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

@@ -13,8 +13,13 @@
         <result column="create_time_" property="createTime"/>
         <result column="reason_" property="reason"/>
         <result column="user_comment_" property="userComment"/>
-        <result column="status_" property="status"
-                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <association property="musicGroup" javaType="com.ym.mec.biz.dal.entity.MusicGroup">
+            <result column="music_group_name_" property="name"/>
+        </association>
+        <association property="user" javaType="com.ym.mec.auth.api.entity.SysUser">
+            <result column="username_" property="username"/>
+        </association>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -34,8 +39,6 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupQuit"
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-        <!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval
-            AS ID FROM DUAL </selectKey> -->
         INSERT INTO music_group_quit
         (id_,user_id_,music_group_id_,join_date_,quit_date_,create_time_,reason_,user_comment_,status_)
         VALUES(#{id},#{userId},#{musicGroupId},#{joinDate},#{quitDate},#{createTime},#{reason},#{userComment},
@@ -87,7 +90,11 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupQuit" parameterType="map">
-        SELECT * FROM music_group_quit ORDER BY id_
+        SELECT mgq.*,mg.name_ music_group_name_,su.username_
+        FROM music_group_quit mgq
+        LEFT JOIN sys_user su ON su.id_ = mgq.user_id_
+        LEFT JOIN music_group mg ON mg.id_ = mgq.music_group_id_
+        ORDER BY id_
         <include refid="global.limit"/>
     </select>