Merge branch 'music_detail' of http://git.dayaedu.com/yonge/mec into music_detail

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

@@ -16,4 +16,6 @@ public interface PhotoAlbumDao extends BaseDAO<Integer, PhotoAlbum> {
     PhotoAlbum findByTypeAndGroupId(@Param("musicGroupId") String musicGroupId, @Param("type") String type);
 
     void batchUpdate(@Param("photoAlbumList") List<PhotoAlbum> photoAlbumList);
+
+    void deleteByIds(@Param("ids") String ids);
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 public interface PhotoDao extends BaseDAO<Integer, Photo> {
 
 
-    void deleteByAlbumId(Integer albumId);
+    void deleteByAlbumIds(String albumIds);
 
     int deleteByIds(@Param("ids") String ids);
 

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

@@ -9,9 +9,9 @@ import java.util.List;
 
 public interface PhotoAlbumService extends BaseService<Integer, PhotoAlbum> {
 
-    int del(Integer id);
-
     PageInfo<PhotoAlbum> queryAlbumPage(PhotoQueryInfo queryInfo);
 
     void batchUpdate(List<PhotoAlbum> photoAlbumList);
+
+    void batchDelete(String ids);
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import static com.ym.mec.biz.dal.entity.ApprovalStatus.PROCESSING;
 import static com.ym.mec.biz.dal.enums.DealStatusEnum.CLOSE;
 import static com.ym.mec.biz.dal.enums.DealStatusEnum.ING;
 import static com.ym.mec.biz.dal.enums.DealStatusEnum.SUCCESS;
@@ -1770,7 +1771,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
         if (musicGroupQuit != null) {
-            if (musicGroupQuit.getStatus() == ApprovalStatus.PROCESSING) {
+            if (musicGroupQuit.getStatus() == PROCESSING) {
                 throw new BizException("申请失败，存在[申请中]的记录");
             }
         }
@@ -1781,7 +1782,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setMusicGroupId(musicGroupId);
         musicGroupQuit.setUserId(sysUser.getId());
         musicGroupQuit.setUserComment(reason);
-        musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
+        musicGroupQuit.setStatus(PROCESSING);
 
         musicGroupQuitDao.insert(musicGroupQuit);
         Set<Integer> roleIds = new HashSet<>(1);
@@ -1817,7 +1818,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
-        if (musicGroupQuit.getStatus() != ApprovalStatus.PROCESSING) {
+        if (musicGroupQuit.getStatus() != PROCESSING) {
             throw new BizException("当前状态下不能取消");
         }
         musicGroupQuit.setStatus(ApprovalStatus.CANCELED);
@@ -2110,7 +2111,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Date date = new Date();
 
         MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
-        if (musicGroupQuit != null && musicGroupQuit.getStatus() == ApprovalStatus.PROCESSING) {
+        if (musicGroupQuit != null && musicGroupQuit.getStatus() == PROCESSING) {
             musicGroupQuit.setStatus(ApprovalStatus.APPROVED);
             musicGroupQuit.setReason(reason);
             musicGroupQuit.setQuitDate(date);
@@ -3446,14 +3447,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         int musicGroupStudentNum = studentRegistrationDao.findMusicGroupStudentNum(musicGroupId);
         resultMap.put("musicGroupStudentNum",musicGroupStudentNum);
         StudentRegistration studentRegistration = studentRegistrationDao.getStudentRegister(musicGroupId, sysUser.getId());
-        int daysBetween = DateUtil.daysBetween(new Date(), studentRegistration.getCreateTime());
+        int daysBetween = DateUtil.daysBetween(studentRegistration.getCreateTime(),new Date());
         resultMap.put("days",daysBetween);
         MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(sysUser.getId(), musicGroupId);
-        if(musicGroupQuit != null){
-            resultMap.put("memo",musicGroupQuit.getReason());
+        if(musicGroupQuit != null && musicGroupQuit.getStatus() == PROCESSING){
+            resultMap.put("memo",musicGroupQuit.getUserComment());
             resultMap.put("quitTime",musicGroupQuit.getCreateTime());
         }
-        resultMap.put("studentMobile",musicGroup.getEducationalTeacherId());
+        if(musicGroup.getEducationalTeacherId() != null){
+            SysUser user = sysUserFeignService.queryUserById(musicGroup.getEducationalTeacherId());
+            resultMap.put("teacherMobile",user.getPhone());
+        }else {
+            resultMap.put("teacherMobile","027-87718176");
+        }
         return resultMap;
     }
 }

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

@@ -30,13 +30,6 @@ public class PhotoAlbumServiceImpl extends BaseServiceImpl<Integer, PhotoAlbum>
 		return photoAlbumDao;
 	}
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int del(Integer id) {
-		photoDao.deleteByAlbumId(id);
-		return photoAlbumDao.delete(id);
-	}
-
     @Override
     public PageInfo<PhotoAlbum> queryAlbumPage(PhotoQueryInfo queryInfo) {
 		PageInfo<PhotoAlbum> photoAlbumPageInfo = queryPage(queryInfo);
@@ -55,4 +48,11 @@ public class PhotoAlbumServiceImpl extends BaseServiceImpl<Integer, PhotoAlbum>
     public void batchUpdate(List<PhotoAlbum> photoAlbumList) {
 		photoAlbumDao.batchUpdate(photoAlbumList);
     }
+
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void batchDelete(String ids) {
+		photoDao.deleteByAlbumIds(ids);
+		photoAlbumDao.deleteByIds(ids);
+    }
 }

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

@@ -250,7 +250,7 @@
                 AND charge_type_id_ = #{chargeTypeId}
             </if>
             <if test="musicGroupStatus != null">
-                AND status_ = #{musicGroupStatus}
+                AND FIND_IN_SET(status_,#{musicGroupStatus})
             </if>
             <if test="musicGroupId != null">
                 AND FIND_IN_SET(id_,#{musicGroupId})

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

@@ -103,8 +103,11 @@
 	<delete id="delete" >
 		DELETE FROM photo_album_ WHERE id_ = #{id} 
 	</delete>
-	
-	<!-- 分页查询 -->
+    <delete id="deleteByIds">
+		DELETE FROM photo_album_ WHERE FIND_IN_SET(id_,#{ids})
+	</delete>
+
+    <!-- 分页查询 -->
 	<select id="queryPage" resultMap="PhotoAlbum" parameterType="map">
 		SELECT * FROM photo_album_
 		<include refid="queryPageSql"/>

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

@@ -96,8 +96,8 @@
 	<delete id="delete" >
 		DELETE FROM photo_ WHERE id_ = #{id} 
 	</delete>
-	<delete id="deleteByAlbumId">
-		DELETE FROM photo_ WHERE photo_album_id_ = #{albumId}
+	<delete id="deleteByAlbumIds">
+		DELETE FROM photo_ WHERE FIND_IN_SET(photo_album_id_,#{albumIds})
 	</delete>
 	<delete id="deleteByIds">
 		DELETE FROM photo_ WHERE FIND_IN_SET(id_,#{ids})

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

@@ -41,8 +41,9 @@ public class PhotoAlbumController extends BaseController {
 	@ApiOperation("删除")
 	@PostMapping(value = "del")
 	@PreAuthorize("@pcs.hasPermissions('photoAlbum/del')")
-	public Object del(Integer id) {
-		return succeed(photoAlbumService.del(id));
+	public Object del(String ids) {
+		photoAlbumService.batchDelete(ids);
+		return succeed();
 	}
 
 	@ApiOperation("分页查询")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java

@@ -7,10 +7,14 @@ import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequestMapping("eduPhotoAlbum")
 @Api(tags = "相册")
 @RestController
@@ -26,15 +30,17 @@ public class EduPhotoAlbumController extends BaseController {
 	}
 
 	@ApiOperation("修改")
-	@PostMapping(value = "update")
-	public Object update(PhotoAlbum photoAlbum) {
-		return succeed(photoAlbumService.update(photoAlbum));
+	@PostMapping(value = "batchUpdate")
+	public Object batchUpdate(@RequestBody List<PhotoAlbum> photoAlbumList) {
+		photoAlbumService.batchUpdate(photoAlbumList);
+		return succeed();
 	}
 
 	@ApiOperation("删除")
 	@PostMapping(value = "del")
-	public Object del(Integer id) {
-		return succeed(photoAlbumService.del(id));
+	public Object del(String ids) {
+		photoAlbumService.batchDelete(ids);
+		return succeed();
 	}
 
 	@ApiOperation("分页查询")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoController.java

@@ -7,6 +7,7 @@ import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,9 +30,9 @@ public class EduPhotoController extends BaseController {
 	}
 
 	@ApiOperation("修改")
-	@PostMapping(value = "update")
-	public Object update(Photo photo) {
-		return succeed(photoService.update(photo));
+	@PostMapping(value = "batchUpdate")
+	public Object batchUpdate(@RequestBody List<Photo> photoList) {
+		return succeed(photoService.batchUpdate(photoList));
 	}
 
 	@ApiOperation("删除")