Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MergeClassSplitClassAffirmDto.java

@@ -5,18 +5,35 @@ import java.util.List;
 import java.util.Map;
 
 public class MergeClassSplitClassAffirmDto {
+    //新建班级参数
     private List<ClassGroup4MixDto> classGroup4MixDtos;
 
+    //缴费项目参数
     private List<MusicGroupPaymentCalenderDto> musicGroupPaymentCalenderDtos;
 
+    //需要合并的班级列表
     private List<Integer> classGroupIds;
 
+    //主班
+    private Integer masterClassGroupId;
+
+    //所选学员列表
     private List<Integer> studentIds;
 
+    //班级和学员关联
     private List<Map<Integer,String>> classGroupStudents;
 
+    //最大的可排课时长
     private Map<String,Long> classCourseMinuteMap;
 
+    public Integer getMasterClassGroupId() {
+        return masterClassGroupId;
+    }
+
+    public void setMasterClassGroupId(Integer masterClassGroupId) {
+        this.masterClassGroupId = masterClassGroupId;
+    }
+
     public Map<String, Long> getClassCourseMinuteMap() {
         return classCourseMinuteMap;
     }

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

@@ -468,7 +468,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     Map<String,Integer> classGroupSubCourseNum(Integer classGroupId);
 
     /**
-     * 进行中乐团-修改-班级详情-学员班级调整-生成默认缴费信息
+     * 进行中乐团-修改-班级详情-学员班级调整-获取所选班级最大可排课时长
      * @author zouxuan
      * @param classGroupIds
      * @return
@@ -501,4 +501,10 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     HighClassGroupNumDto getSubjectMaxHighClassGroupNum(String musicGroupId,ClassGroupTypeEnum type,String subjectIds);
 
-    }
+    /**
+     * 进行中乐团-修改-班级详情-班级合并-获取学员需要补交的费用以及需要退还的课程余额
+     * @param mergeClassSplitClassAffirmDto
+     * @return
+     */
+    Object queryStudentPaymentCalenders(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto);
+}

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

@@ -3255,34 +3255,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Override
     public Map<String, Integer> classGroupSubCourseNum(Integer classGroupId) {
         return MapUtil.convertIntegerMap(courseScheduleDao.querySubCourseNumMap(classGroupId));
-
-//        List<Map<String,Object>> result = new ArrayList<>();
-//        //获取班级列表
-//        List<ClassGroup> classGroups = classGroupDao.queryClassGroups(musicGroupId, null);
-//        for (ClassGroup classGroup : classGroups) {
-//            Map<String,Object> resultMap = new HashMap();
-//            resultMap.put("classGroup",classGroup);
-//            //获取班级剩余的课程类型和课程数量
-//            List<Map<String,Integer>> courseTypeNumMap = courseScheduleDao.querySubCourseNumMap(classGroup.getId());
-//            resultMap.put("courseTypeNumMap",courseTypeNumMap);
-//            //获取班级里学员列表
-//            resultMap.put("students",classGroupStudentMapperDao.findCourseStudentNameAndPhoneByClassGroupId(classGroup.getId()));
-//            result.add(resultMap);
-//        }
-//        return result;
     }
 
-    @Override
     public Map<String, Object> getDefaultPaymentCalender(List<Integer> classGroupIds) {
         if (classGroupIds == null || classGroupIds.size() == 0) {
             throw new BizException("参数校验失败");
         }
         Map<String, Object> result = new HashMap<>();
         Map<Integer, Map<String, MusicGroupOrganizationCourseSettingsDetail>> resultMap = new HashMap<>();
-        //获取默认的排课时长
-//        JSONObject jsonObject = JSON.parseObject(classAdjust.getDefaultCourseTypeMinute());
-//        String courseDefaultMinutes = sysConfigDao.findConfigValue("music_course_default_minutes");
-//        JSONObject jsonObject = JSON.parseObject(courseDefaultMinutes);
         //获取所选班级最大剩余课时
         Map<String, Long> map = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
         //获取分布默认的课程类型单价
@@ -3545,4 +3525,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         highClassGroupNumDto.setMaxHighClassGroupNum(maxClassGroupNum);
         return highClassGroupNumDto;
     }
+
+    @Override
+    public Object queryStudentPaymentCalenders(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto) {
+        List<Map<String, Integer>> subCourseNumMap = courseScheduleDao.querySubCourseNumMap(mergeClassSplitClassAffirmDto.getMasterClassGroupId());
+        return null;
+    }
 }

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

@@ -341,7 +341,14 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.classGroupSubCourseNum(classGroupId));
     }
 
-    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-生成默认缴费信息")
+    @ApiOperation(value = "进行中乐团-修改-班级详情-班级合并-获取学员需要补交的费用以及需要退还的课程余额")
+    @GetMapping("/queryStudentPaymentCalenders")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/queryStudentPaymentCalenders')")
+    public HttpResponseResult queryStudentPaymentCalenders(@RequestBody MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto) {
+        return succeed(classGroupService.queryStudentPaymentCalenders(mergeClassSplitClassAffirmDto));
+    }
+
+    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-获取所选班级最大可排课时长")
     @PostMapping("/getDefaultPaymentCalender")
     @PreAuthorize("@pcs.hasPermissions('classGroup/getDefaultPaymentCalender')")
     public HttpResponseResult studentClassAuditDetail(@RequestBody List<Integer> classGroupIds) {

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

@@ -217,7 +217,7 @@ public class EmployeeController extends BaseController {
     }
 
     @ApiOperation(value = "员工离职交接")
-    @GetMapping("/level")
+    @PostMapping("/level")
     @PreAuthorize("@pcs.hasPermissions('employee/level')")
     public HttpResponseResult level(@RequestBody List<EmployeeLevelDto> employeeLevelDtos){
         employeeService.level(employeeLevelDtos);