拆班合班

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

@@ -10,6 +10,16 @@ public class MergeClassSplitClassAffirmDto {
 
     private List<Integer> classGroupIds;
 
+    private List<Integer> studentIds;
+
+    public List<Integer> getStudentIds() {
+        return studentIds;
+    }
+
+    public void setStudentIds(List<Integer> studentIds) {
+        this.studentIds = studentIds;
+    }
+
     public List<Integer> getClassGroupIds() {
         return classGroupIds;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentClassAudit.java

@@ -0,0 +1,38 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
+import com.ym.mec.biz.dal.dto.MusicGroupPaymentCalenderDto;
+import com.ym.mec.common.enums.BaseEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 对应数据库表(music_group_student_audit):
+ */
+public class MusicGroupStudentClassAudit {
+
+	private Integer id;
+
+	@ApiModelProperty(value = "缴费项目批次号", required = false)
+	private String batchNo;
+
+	@ApiModelProperty(value = "班级明细", required = false)
+	private List<ClassGroup4MixDto> classGroup4MixDtos;
+
+	@ApiModelProperty(value = "所选班级列表", required = false)
+	private List<Integer> classGroupIds;
+
+	@ApiModelProperty(value = "所选学员列表", required = false)
+	private List<Integer> studentIds;
+
+	@ApiModelProperty(value = "冻结的课程列表", required = false)
+	private List<Long> courseIds;
+
+
+
+}

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

@@ -31,6 +31,7 @@ import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.service.IdGeneratorService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -162,6 +163,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
     @Autowired
     private MusicGroupPaymentCalenderService musicGroupPaymentCalenderService;
+    @Autowired
+    private IdGeneratorService idGeneratorService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -3283,11 +3286,14 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if(classGroupIds == null || classGroupIds.size() == 0){
             throw new BizException("参数校验失败");
         }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicGroup musicGroup = musicGroupDao.findByClassGroupId(classGroupIds.get(0));
-        //生成缴费记录
+
+        //生成缴费记录,同一个批次
+        MusicGroupPaymentCalender.PaymentCalenderStatusEnum status = null;
         List<MusicGroupPaymentCalenderDto> paymentCalenderDtos = mergeClassSplitClassAffirmDto.getMusicGroupPaymentCalenderDtos();
         if(paymentCalenderDtos != null && paymentCalenderDtos.size() > 0){
-            MusicGroupPaymentCalender.PaymentCalenderStatusEnum status = null;
+            String batchNo = idGeneratorService.generatorId() + "";
             for (MusicGroupPaymentCalenderDto calenderDto : paymentCalenderDtos) {
                 if(status != null && status != AUDITING){
                     List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = calenderDto.getMusicGroupPaymentCalenderCourseSettingsList();
@@ -3310,6 +3316,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 if(status != null && status == AUDITING){
                     calenderDto.setStatus(AUDITING);
                 }
+                //指定批次
+                calenderDto.setBatchNo(batchNo);
                 musicGroupPaymentCalenderService.create(calenderDto);
             }
         }
@@ -3322,6 +3330,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //冻结所选班级的课程
         courseScheduleDao.batchUpdateLockByClassGroupIds(classGroupIds,1);
         //保存学员应该增加的课程时长
+        //记录申请信息
+        
         return null;
     }
 }

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

@@ -178,7 +178,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		PaymentCalenderStatusEnum status = PaymentCalenderStatusEnum.NO;
 
 		Date date = new Date();
-		String batchNo = idGeneratorService.generatorId() + "";
+		String batchNo;
+		if(StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo())){
+			batchNo = idGeneratorService.generatorId() + "";
+		}else {
+			batchNo = musicGroupPaymentCalenderDto.getBatchNo();
+		}
 
 		// 获取设置的课程
 		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalenderDto