乐团档案

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupPerformanceQueryInfo.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class MusicGroupPerformanceQueryInfo extends QueryInfo {
+
+    private String musicGroupId;
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+}

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

@@ -67,11 +67,24 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="MusicGroupPerformance" parameterType="map">
-		SELECT * FROM music_group_performance ORDER BY id_ <include refid="global.limit"/>
+		SELECT mgp.*,su.real_name_ operator_name_ FROM music_group_performance mgp
+		LEFT JOIN sys_user su ON  su.id_ = mgp.operator_
+		<where>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				AND mgp.music_group_id_ = #{musicGroupId}
+			</if>
+		</where>
+		ORDER BY mgp.order_ ASC,mgp.start_time_ ASC
+		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_performance
+		SELECT COUNT(mgp.id_) FROM music_group_performance mgp
+		<where>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				AND mgp.music_group_id_ = #{musicGroupId}
+			</if>
+		</where>
 	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPerformanceController.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MusicGroupPerformance;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
+import com.ym.mec.biz.dal.page.MusicGroupPerformanceQueryInfo;
 import com.ym.mec.biz.service.MusicGroupPerformanceService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
@@ -63,7 +64,7 @@ public class MusicGroupPerformanceController extends BaseController {
 	@ApiOperation("分页查询")
 	@PostMapping(value = "queryPage")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupPerformance/queryPage')")
-	public Object queryPage(QueryInfo queryInfo) {
+	public Object queryPage(MusicGroupPerformanceQueryInfo queryInfo) {
 		return succeed(musicGroupPerformanceService.queryPage(queryInfo));
 	}