班级重命名

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

@@ -588,4 +588,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId);
 
     CourseScheduleStatistics getMusicGroupCourseScheduleStatistics(queryMusicGroupCourseScheduleQueryInfo queryInfo);
+
+    //修改班级基本信息
+    int updateClassGroup(ClassGroup classGroup);
 }

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

@@ -3412,6 +3412,26 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateClassGroup(ClassGroup classGroup) {
+        ClassGroup group = classGroupDao.get(classGroup.getId());
+        if(Objects.isNull(group)){
+            throw new BizException("班级信息不存在");
+        }
+        String groupName = classGroup.getName();
+        if(StringUtils.isEmpty(groupName)){
+            throw new BizException("请填写班级名称");
+        }
+        classGroupDao.update(classGroup);
+        ImGroup imGroup = imGroupService.get(classGroup.getId().longValue());
+        if(!Objects.isNull(imGroup)){
+            imGroup.setName(groupName);
+            imGroupService.update(imGroup);
+        }
+        return 1;
+    }
+
+    @Override
     public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseScheduleDetail(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
         PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();

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

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.CourseScheduleStatistics;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.ExportTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.page.ClassGroupQueryInfo;
@@ -17,7 +19,6 @@ import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
@@ -30,9 +31,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @RequestMapping("classGroup")
@@ -64,6 +62,14 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.create(classGroup));
     }
 
+    @ApiOperation(value = "班级基本信息修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
+    public HttpResponseResult update(ClassGroup classGroup) throws Exception {
+        classGroup.setUpdateTime(new Date());
+        return succeed(classGroupService.updateClassGroup(classGroup));
+    }
+
     @ApiOperation(value = "新增单技班班级")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('classGroup/add')")
@@ -107,15 +113,6 @@ public class ClassGroupController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "修改班级")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
-    public Object update(ClassGroup classGroup) {
-        classGroup.setUpdateTime(new Date());
-        classGroupService.update(classGroup);
-        return succeed();
-    }
-
     @ApiOperation(value = "合奏班相关班级获取")
     @GetMapping("/findClassGroupAboutMix")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findClassGroupAboutMix')")