Browse Source

问题一大堆

zouxuan 2 years ago
parent
commit
1833bc84d4

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

@@ -501,9 +501,6 @@ public class StudentManageController extends BaseController {
             musicGroupQuit.setReasonEnum(reasonEnum);
             musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
             musicGroupQuit.setOperatorId(operatorId);
-            musicGroupQuit.setSchoolStaffAuditStatus(EQuitGroupAuditStatusEnum.PASS);
-            musicGroupQuit.setSchoolStaffAuditReason(reason);
-            musicGroupQuit.setAuditSchoolStaff(operatorId);
             musicGroupQuits.add(musicGroupQuit);
         }
         musicGroupService.batchQuitMusicGroup(musicGroupQuits);

+ 37 - 0
mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolMusicGroupQuitController.java

@@ -1,19 +1,27 @@
 package com.ym.mec.web.controller.school;
 
+import com.ym.mec.biz.dal.entity.ApprovalStatus;
+import com.ym.mec.biz.dal.entity.MusicGroupQuit;
+import com.ym.mec.biz.dal.enums.school.EQuitGroupAuditStatusEnum;
 import com.ym.mec.biz.dal.school.dto.MusicGroupQuitDetailDto;
 import com.ym.mec.biz.dal.school.dto.MusicGroupQuitPageDto;
 import com.ym.mec.biz.dal.school.page.MusicGroupQuitQueryInfo;
 import com.ym.mec.biz.service.MusicGroupQuitService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -25,6 +33,10 @@ public class SchoolMusicGroupQuitController extends BaseController {
 
     @Autowired
     private MusicGroupQuitService musicGroupQuitService;
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private MusicGroupService musicGroupService;
 
 	@ApiOperation(value = "分页查询")
     @PostMapping("/queryPage")
@@ -33,6 +45,31 @@ public class SchoolMusicGroupQuitController extends BaseController {
         return succeed(musicGroupQuitService.queryPageBySchool(queryInfo));
 	}
 
+    @ApiOperation(value = "申请退团")
+    @PostMapping("/quitMusicGroup")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "reason", value = "原因", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "reasonEnum", value = "原因", required = true, dataType = "String")})
+    public HttpResponseResult quitMusicGroup(String musicGroupId,Integer userId, String reason, MusicGroupQuit.ReasonEnum reasonEnum) throws Exception {
+        Integer operatorId = sysUserService.getUserId();
+        List<MusicGroupQuit> musicGroupQuits = new ArrayList<>();
+        for (String groupId : musicGroupId.split(",")) {
+            MusicGroupQuit musicGroupQuit = new MusicGroupQuit();
+            musicGroupQuit.setUserId(userId);
+            musicGroupQuit.setMusicGroupId(groupId);
+            musicGroupQuit.setUserComment(reason);
+            musicGroupQuit.setReasonEnum(reasonEnum);
+            musicGroupQuit.setStatus(ApprovalStatus.PROCESSING);
+            musicGroupQuit.setOperatorId(operatorId);
+            musicGroupQuit.setSchoolStaffAuditStatus(EQuitGroupAuditStatusEnum.PASS);
+            musicGroupQuit.setSchoolStaffAuditReason(reason);
+            musicGroupQuit.setAuditSchoolStaff(operatorId);
+            musicGroupQuits.add(musicGroupQuit);
+        }
+        musicGroupService.batchQuitMusicGroup(musicGroupQuits);
+        return succeed();
+    }
+
 	@ApiOperation(value = "获取退团详情")
     @GetMapping("/getDetail")
     public HttpResponseResult<MusicGroupQuitDetailDto> getDetail(Long musicGroupQuitId) {