update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysRoleServiceImpl.java

@@ -1,15 +1,12 @@
 package com.ym.mec.auth.service.impl;
 
 import com.ym.mec.auth.api.entity.SysRole;
-import com.ym.mec.auth.api.entity.SysRoleMenu;
 import com.ym.mec.auth.dal.dao.SysRoleDao;
 import com.ym.mec.auth.dal.dao.SysRoleMenuDao;
 import com.ym.mec.auth.service.SysRoleService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.common.tenant.TenantContextHolder;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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

@@ -0,0 +1,25 @@
+package com.ym.mec.biz.dal.dto;
+
+//进行中加学员参数拓展
+public class CalenderAddStudent {
+
+    private String classGroupIds;
+
+    private String studentIds;
+
+    public String getClassGroupIds() {
+        return classGroupIds;
+    }
+
+    public void setClassGroupIds(String classGroupIds) {
+        this.classGroupIds = classGroupIds;
+    }
+
+    public String getStudentIds() {
+        return studentIds;
+    }
+
+    public void setStudentIds(String studentIds) {
+        this.studentIds = studentIds;
+    }
+}

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

@@ -47,6 +47,17 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "乐团课程信息", required = false)
 	private List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList;
 
+	@ApiModelProperty(value = "进行中加学员拓展信息", required = false)
+	private CalenderAddStudent calenderAddStudent;
+
+	public CalenderAddStudent getCalenderAddStudent() {
+		return calenderAddStudent;
+	}
+
+	public void setCalenderAddStudent(CalenderAddStudent calenderAddStudent) {
+		this.calenderAddStudent = calenderAddStudent;
+	}
+
 	public List<MusicGroupPaymentCalenderActivity> getCalenderActivityList() {
 		return calenderActivityList;
 	}

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

@@ -76,16 +76,6 @@ public class MusicGroupPaymentCalenderDto {
 		this.memberRankSettingId = memberRankSettingId;
 	}
 
-	private Boolean autoCreate = false;
-
-	public Boolean getAutoCreate() {
-		return autoCreate;
-	}
-
-	public void setAutoCreate(Boolean autoCreate) {
-		this.autoCreate = autoCreate;
-	}
-
 	@ApiModelProperty(value = "跨团合并时缴费项目中学员的缴费明细")
 	private List<MusicGroupPaymentCalenderStudentDetail> musicGroupPaymentCalenderStudentDetails;
 

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

@@ -4597,7 +4597,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         paymentCalenderDto.setPaymentType(SPAN_GROUP_CLASS_ADJUST);
         //生成缴费项目
         paymentCalenderDto.setMasterTotalPrice(masterTotalPrice);
-        paymentCalenderDto.setIsGiveMusicNetwork(false);
+//        paymentCalenderDto.setIsGiveMusicNetwork(false);
         paymentCalenderDto.setStudentIds(StringUtils.join(studentIds, ","));
         musicGroupPaymentCalenderService.create(paymentCalenderDto);
         //记录申请信息

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

@@ -192,14 +192,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if (musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE && musicGroupPaymentDateRangeList.size() > 1) {
 			throw new BizException("创建缴费失败：会员收费乐团不支持多周期缴费");
 		}
-		//是否自动创建
-		if(!musicGroupPaymentCalenderDto.getAutoCreate()){
-			// 所有缴费项目已完成排课才能创建下一个缴费项目
-			String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null,musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
-			if (StringUtils.isNoneBlank(orignBatchNo)) {
-				if(StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(orignBatchNo)){
-					throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
-				}
+		// 所有缴费项目已完成排课才能创建下一个缴费项目
+		String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null,musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
+		if (StringUtils.isNoneBlank(organBatchNo)) {
+			if(StringUtils.isEmpty(musicGroupPaymentCalenderDto.getBatchNo()) || !musicGroupPaymentCalenderDto.getBatchNo().equals(organBatchNo)){
+				throw new BizException("当前乐团存在未排课的缴费项目，请先完成排课再操作");
 			}
 		}
 

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

@@ -237,7 +237,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 			}
 		}
 
-		Date date = new Date();
+		/*Date date = new Date();
 		//会员结束前15天自动创建乐团续费（默认提前15天）
 		String autoCreateMemberRenew = sysTenantConfigService.getTenantConfigValue(SysConfigService.AUTO_CREATE_MEMBER_RENEW,tenantId);
 		if(StringUtils.isNotEmpty(autoCreateMemberRenew)){
@@ -306,7 +306,7 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 							"STUDENT",memberName,autoCreateMemberRenew);
 				}
 			}
-		}
+		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -966,7 +966,9 @@ public class StudentServeServiceImpl implements StudentServeService {
         LocalDate monDayDate = localDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
         LocalDate sunDayDate = localDate.with(DateUtil.weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 
+        //课后作业
         Set<Integer> hss = studentCourseHomeworkDao.checkStudentHaveHomeworkInDateRange(monDayDate.toString(), sunDayDate.toString(), studentIds);
+        //课外训练
         Set<Integer> ess = extracurricularExercisesReplyDao.checkStudentHaveExercisesInDateRange(monDayDate.toString(), sunDayDate.toString(), studentIds);
         for (Integer studentId : studentIds) {
             if(!hss.contains(studentId)&&!ess.contains(studentId)){