乐团档案学生端

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);
@@ -3449,7 +3450,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         int daysBetween = DateUtil.daysBetween(studentRegistration.getCreateTime(),new Date());
         resultMap.put("days",daysBetween);
         MusicGroupQuit musicGroupQuit = musicGroupQuitDao.queryByUserIdAndMusicGroupId(sysUser.getId(), musicGroupId);
-        if(musicGroupQuit != null){
+        if(musicGroupQuit != null && musicGroupQuit.getStatus() == PROCESSING){
             resultMap.put("memo",musicGroupQuit.getReason());
             resultMap.put("quitTime",musicGroupQuit.getCreateTime());
         }