zouxuan 4 роки тому
батько
коміт
3c478f5d38

+ 6 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysExamSongAccompanimentDao.java

@@ -28,4 +28,10 @@ public interface SysExamSongAccompanimentDao extends BaseDAO<Integer, SysExamSon
      * @return
      */
     List<Integer> findSubjectByExamId(@Param("sysExamSongId") Integer sysExamSongId, @Param("examSongAccIds") List<Integer> examSongAccIds);
+
+    /**
+     * 批量删除
+     * @param delExamSongAccompanimentIds
+     */
+    void batchDel(@Param("delExamSongAccompanimentIds") List<Integer> delExamSongAccompanimentIds);
 }

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ExamSongDto.java

@@ -14,6 +14,17 @@ public class ExamSongDto {
     @ApiModelProperty(value = "伴奏",required = false)
     private List<SysExamSongAccompaniment> sysExamSongAccompaniments;
 
+    @ApiModelProperty(value = "需要删除的id",required = false)
+    private List<Integer> delExamSongAccompanimentIds;
+
+    public List<Integer> getDelExamSongAccompanimentIds() {
+        return delExamSongAccompanimentIds;
+    }
+
+    public void setDelExamSongAccompanimentIds(List<Integer> delExamSongAccompanimentIds) {
+        this.delExamSongAccompanimentIds = delExamSongAccompanimentIds;
+    }
+
     public SysExamSong getSysExamSong() {
         return sysExamSong;
     }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/UploadFileService.java

@@ -32,7 +32,7 @@ public class UploadFileService {
 	private int maxSize;
 
 	/** 支持的扩展名 */
-	@Value("${common.upload.supportExtensions:jpg,jpeg,gif,png,mp3,mid,midi,aac,m4a,mp4}")
+	@Value("${common.upload.supportExtensions:jpg,jpeg,gif,png,mp3,mid,midi,aac,m4a,mp4,xml}")
 	private String supportExtensions;
 
 	/** 文件根目录 */

+ 4 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysExamSongServiceImpl.java

@@ -64,6 +64,10 @@ public class SysExamSongServiceImpl extends BaseServiceImpl<Integer, SysExamSong
 	public void updateExamSong(ExamSongDto examSongDto) {
 		SysExamSong sysExamSong = examSongDto.getSysExamSong();
 		sysExamSongDao.update(sysExamSong);
+		List<Integer> delExamSongAccompanimentIds = examSongDto.getDelExamSongAccompanimentIds();
+		if(delExamSongAccompanimentIds != null && delExamSongAccompanimentIds.size() > 0){
+			sysExamSongAccompanimentDao.batchDel(delExamSongAccompanimentIds);
+		}
 		List<SysExamSongAccompaniment> sysExamSongAccompaniment = examSongDto.getSysExamSongAccompaniments();
 		if(sysExamSongAccompaniment != null && sysExamSongAccompaniment.size() > 0){
 			List<Integer> subjectIdList = sysExamSongAccompaniment.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());

+ 8 - 1
mec-biz/src/main/resources/config/mybatis/SysExamSongAccompanimentMapper.xml

@@ -96,8 +96,15 @@
 		</set> WHERE id_ = #{item.id}
 		</foreach>
 	</update>
+    <update id="batchDel">
+		UPDATE sys_exam_song_accompaniment SET del_flag_ = 1,update_time_ = NOW() WHERE id_ IN
+		<foreach collection="sysExamSongAccompaniment" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+
+	</update>
 
-	<!-- 分页查询 -->
+    <!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysExamSongAccompaniment" parameterType="map">
 		SELECT sesa.*,s.name_ subject_name_
 		FROM sys_exam_song_accompaniment sesa

+ 3 - 3
mec-web/src/main/java/com/ym/mec/web/controller/SysExamSongAccompanimentController.java

@@ -21,7 +21,7 @@ public class SysExamSongAccompanimentController extends BaseController {
 
     @ApiOperation(value = "修改")
     @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('sysExamSong/update')")
+    @PreAuthorize("@pcs.hasPermissions('sysExamSongAccompaniment/update')")
     public Object update(@RequestBody SysExamSongAccompaniment sysExamSongAccompaniment) {
         sysExamSongAccompanimentService.updateAcc(sysExamSongAccompaniment);
         return succeed();
@@ -29,7 +29,7 @@ public class SysExamSongAccompanimentController extends BaseController {
 
     @ApiOperation(value = "删除")
     @PostMapping("/del/{id}")
-    @PreAuthorize("@pcs.hasPermissions('sysExamSong/del')")
+    @PreAuthorize("@pcs.hasPermissions('sysExamSongAccompaniment/del')")
     public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
         sysExamSongAccompanimentService.delete(id);
         return succeed();
@@ -37,7 +37,7 @@ public class SysExamSongAccompanimentController extends BaseController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('sysExamSong/queryPage')")
+    @PreAuthorize("@pcs.hasPermissions('sysExamSongAccompaniment/queryPage')")
     public Object queryPage(SysExamSongQueryInfo queryInfo) {
         return succeed(sysExamSongAccompanimentService.queryPage(queryInfo));
     }