|
@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
|
|
|
import static com.ym.mec.biz.dal.enums.DealStatusEnum.CLOSE;
|
|
|
import static com.ym.mec.biz.dal.enums.DealStatusEnum.ING;
|
|
|
import static com.ym.mec.biz.dal.enums.DealStatusEnum.SUCCESS;
|
|
|
+import static com.ym.mec.biz.dal.enums.IndexErrorType.WAIT_CREATE_PAYMENT_CALENDER;
|
|
|
import static com.ym.mec.biz.dal.enums.PaymentStatusEnum.YES;
|
|
|
|
|
|
import java.io.IOException;
|
|
@@ -19,6 +20,7 @@ import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -79,37 +81,8 @@ import com.ym.mec.biz.dal.dto.SporadicPayDto;
|
|
|
import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
|
|
|
import com.ym.mec.biz.dal.dto.SubjectRegisterDto;
|
|
|
import com.ym.mec.biz.dal.dto.UpdateExpectedNumDto;
|
|
|
-import com.ym.mec.biz.dal.entity.ApprovalStatus;
|
|
|
-import com.ym.mec.biz.dal.entity.ChargeType;
|
|
|
-import com.ym.mec.biz.dal.entity.ClassGroup;
|
|
|
-import com.ym.mec.biz.dal.entity.CooperationOrgan;
|
|
|
-import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
-import com.ym.mec.biz.dal.entity.CourseScheduleTeacherSalary;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupBuildLog;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentType;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderCourseSettings;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupQuit;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
|
|
|
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
|
|
|
-import com.ym.mec.biz.dal.entity.Organization;
|
|
|
-import com.ym.mec.biz.dal.entity.School;
|
|
|
-import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
|
|
|
-import com.ym.mec.biz.dal.entity.Student;
|
|
|
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
|
|
|
-import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
|
|
|
-import com.ym.mec.biz.dal.entity.StudentPreRegistration;
|
|
|
-import com.ym.mec.biz.dal.entity.StudentRegistration;
|
|
|
-import com.ym.mec.biz.dal.entity.Subject;
|
|
|
-import com.ym.mec.biz.dal.entity.SubjectChange;
|
|
|
-import com.ym.mec.biz.dal.entity.SysUserCashAccount;
|
|
|
-import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
|
|
|
import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
|
|
|
import com.ym.mec.biz.dal.enums.CourseStatusEnum;
|
|
|
import com.ym.mec.biz.dal.enums.DealStatusEnum;
|
|
@@ -2421,14 +2394,32 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//获取用户权限列表
|
|
|
List<Integer> roles = employeeDao.queryUserRole(sysUser.getId());
|
|
|
PageInfo<MusicGroup> musicGroupPageInfo;
|
|
|
- if (roles != null && roles.size() == 1 && roles.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
|
|
|
- //只有教务老师权限
|
|
|
- /*String musicGroupIds = musicGroupDao.queryEducationalMusicGroupId(sysUser.getId());
|
|
|
- queryInfo.setMusicGroupId(musicGroupIds);*/
|
|
|
- musicGroupPageInfo = queryPage(queryInfo);
|
|
|
- } else {
|
|
|
- musicGroupPageInfo = queryPage(queryInfo);
|
|
|
+ //待创建缴费项目提醒
|
|
|
+ if(queryInfo.getSearchType() == "WAIT_CREATE_PAYMENT_CALENDER"){
|
|
|
+ Integer educationUserId = null;
|
|
|
+ if (!sysUser.getIsSuperAdmin() && roles.size() == 1 && roles.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
|
|
|
+ educationUserId = sysUser.getId();
|
|
|
+ }
|
|
|
+ //获取关联的乐团列表
|
|
|
+ List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,queryInfo.getOrganId());
|
|
|
+ String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
|
|
|
+ Date date = new Date();
|
|
|
+ String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
|
|
|
+ if(musicGroupIds.size() > 0){
|
|
|
+ List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
|
|
|
+ if(calenderIds.size() > 0){
|
|
|
+ List<String> queryMusicGroupIds = musicGroupPaymentCalenderDao.queryMusicGroupIds(calenderIds);
|
|
|
+ if(queryInfo.getMusicGroupIds() != null){
|
|
|
+ queryMusicGroupIds.addAll(queryInfo.getMusicGroupIds());
|
|
|
+ }
|
|
|
+ queryInfo.setMusicGroupIds(queryMusicGroupIds);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(queryInfo.getMusicGroupIds() == null || queryInfo.getMusicGroupIds().size() == 0){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|
|
|
+ musicGroupPageInfo = queryPage(queryInfo);
|
|
|
List<MusicGroup> musicGroupList = musicGroupPageInfo.getRows();
|
|
|
|
|
|
if (musicGroupList == null || musicGroupList.size() == 0) {
|