教学伴奏调整

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreCategoriesDao.java

@@ -20,4 +20,6 @@ public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicSco
     String findByCategoriesIds(@Param("categoriesIds") String categoriesIds);
 
     void batchUpdate(@Param("categories") List<SysMusicScoreCategories> updateCategories, @Param("organId") String organId, @Param("enable") Boolean enable);
+
+    void enable(@Param("categoriesIds") String categoriesIds, @Param("enable") boolean enable);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreCategoriesService.java

@@ -16,4 +16,6 @@ public interface SysMusicScoreCategoriesService extends BaseService<Integer, Sys
     void updateCategories(SysMusicScoreCategories musicScoreCategories);
 
     void del(Integer id);
+
+    void enable(Integer categoriesId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreCategoriesServiceImpl.java

@@ -6,9 +6,11 @@ import com.ym.mec.auth.api.entity.SysMenu;
 import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
 import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -145,6 +147,18 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		sysMusicScoreCategoriesDao.batchDel(byCategoriesIds);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void enable(Integer categoriesId) {
+		SysMusicScoreCategories categories = sysMusicScoreCategoriesDao.get(categoriesId);
+		if(categories == null){
+			throw new BizException("分类不存在");
+		}
+		String byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(categoriesId.toString());
+		byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(byCategoriesIds);
+		sysMusicScoreCategoriesDao.enable(byCategoriesIds,!categories.getEnable());
+	}
+
 	private SysMusicScoreCategories getTree(SysMusicScoreCategories categories,List<SysMusicScoreCategories> scoreCategoriesAllList){
 		//得到根节点对象
 		//获取子节点list

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

@@ -15,6 +15,7 @@
 		<result column="cover_img_" property="coverImg" />
 		<result column="operator_id_" property="operatorId" />
 		<result column="order_" property="order" />
+		<result column="organ_name_" property="organNames" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -94,6 +95,9 @@
 		</set> WHERE id_ = #{bean.id}
 		</foreach>
 	</update>
+	<update id="enable">
+		UPDATE sys_music_score_categories SET enable_ = #{enable} WHERE FIND_IN_SET(id_,#{categoriesIds})
+	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -105,13 +109,37 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreCategories" parameterType="map">
-		SELECT * FROM sys_music_score_categories ORDER BY id_
+		SELECT sm.*,GROUP_CONCAT(o.name_) organ_name_ FROM sys_music_score_categories sm
+		LEFT JOIN organization o ON FIND_IN_SET(o.id_,sm.organ_id_)
+		<where>
+			<if test="parentId != null">
+				sm.parent_id_ = #{parentId}
+			</if>
+			<if test="enable != null">
+				AND sm.enable_ = 1
+			</if>
+			<if test="search != null and search != ''">
+				AND (sm.id_ = #{search} OR sm.name_ LIKE CONCAT('%',#{search},'%'))
+			</if>
+		</where>
+		GROUP BY sm.id_
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM sys_music_score_categories
+		SELECT COUNT(sm.id_) FROM sys_music_score_categories sm
+		<where>
+			<if test="parentId != null">
+				sm.parent_id_ = #{parentId}
+			</if>
+			<if test="enable != null">
+				AND sm.enable_ = 1
+			</if>
+			<if test="search != null and search != ''">
+				AND sm.id_ = #{search} OR sm.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
+		</where>
 	</select>
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
 		SELECT sm.* FROM sys_music_score_categories sm

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +24,18 @@ public class SysMusicScoreCategoriesController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setParentId(0);
         return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "启用、停用")
+    @RequestMapping("/enable")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/enable')")
+    public Object enable(Integer categoriesId) {
+        sysMusicScoreCategoriesService.enable(categoriesId);
+        return succeed();
+    }
+
     @ApiOperation(value = "新增")
     @PostMapping("/save")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/save')")