Merge remote-tracking branch 'origin/master'

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

@@ -28,5 +28,5 @@ public interface IndexBaseMonthDataService extends BaseService<Long, IndexBaseMo
      * @param organIds
      * @return
      */
-    Boolean hasIndexErrData(String organIds);
+    Map<String,Boolean> hasIndexErrData(String organIds);
 }

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

@@ -418,66 +418,93 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	}
 
 	@Override
-	public Boolean hasIndexErrData(String organIdsStr) {
+	public Map<String,Boolean> hasIndexErrData(String organIdsStr) {
+		Map<String,Boolean> resultMap = new HashMap<>();
 		Set<Integer> organIds = null;
 		if(StringUtils.isNotBlank(organIdsStr)){
 			organIds = Arrays.stream(organIdsStr.split(",")).map(Integer::new).collect(Collectors.toSet());
 		}
 		Date date = new Date();
+		boolean flag = false;
 		int countLessThenThreeClassGroupNum = indexBaseMonthDataDao.countLessThenThreeClassGroupNum(organIds);
 		if(countLessThenThreeClassGroupNum > 0){
-			return true;
+			flag = true;
 		}
-		List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
-		if(errInspection.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> errInspection = indexBaseMonthDataDao.queryErrInspection(organIds);
+			if(errInspection.size() > 0){
+				flag = true;
+			}
 		}
 		Date firstDayOfMonth = DateUtil.getFirstDayOfMonth(DateUtil.addMonths(date, -1));
-		int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds);
-		if(countNoPaymentStudentNum > 0){
-			return true;
+		if(!flag){
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds);
+			if(countNoPaymentStudentNum > 0){
+				flag = true;
+			}
 		}
-		List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
-		if(quitGroupNum.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds);
+			if(quitGroupNum.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),firstDayOfMonth);
-		if(attendanceInfo.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceInfo = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.TRUANT.getCode(),firstDayOfMonth);
+			if(attendanceInfo.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),null);
-		if(attendanceInfo1.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceInfo1 = indexBaseMonthDataDao.queryStudentAttendanceInfo(organIds, StudentAttendanceStatusEnum.LEAVE.getCode(),null);
+			if(attendanceInfo1.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,firstDayOfMonth);
-		if(attendanceError.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> attendanceError = indexBaseMonthDataDao.getAttendanceError(organIdsStr,firstDayOfMonth);
+			if(attendanceError.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth);
-		if(noAttendance.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> noAttendance = indexBaseMonthDataDao.getNoAttendance(organIdsStr,firstDayOfMonth);
+			if(noAttendance.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
-		if(teacherLeave.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> teacherLeave = indexBaseMonthDataDao.queryTeacherLeave(organIdsStr);
+			if(teacherLeave.size() > 0){
+				flag = true;
+			}
 		}
-		String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-		List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-		if(lowTeacherSalary.size() > 0){
-			return true;
+		if(!flag){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			List<Long> lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
-		if(inspectionItem.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> inspectionItem = indexBaseMonthDataDao.queryInspectionItem(organIdsStr);
+			if(inspectionItem.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
-		if(inspectionItemPlan.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> inspectionItemPlan = indexBaseMonthDataDao.queryInspectionItemPlan(organIdsStr);
+			if(inspectionItemPlan.size() > 0){
+				flag = true;
+			}
 		}
-		List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
-		if(studentVisit.size() > 0){
-			return true;
+		if(!flag){
+			List<Long> studentVisit = indexBaseMonthDataDao.queryStudentVisit(organIdsStr);
+			if(studentVisit.size() > 0){
+				flag = true;
+			}
 		}
+		resultMap.put("indexErrData",flag);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
@@ -492,9 +519,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if(musicGroupIds.size() > 0){
 			List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
 			if(calenderIds.size() > 0){
-				return true;
+				resultMap.put("indexErrData",true);
+			}else {
+				resultMap.put("remindMatterData",false);
 			}
 		}
-		return false;
+		return resultMap;
 	}
 }

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

@@ -541,15 +541,13 @@ public class StudentServeServiceImpl implements StudentServeService {
         }
 
         if(!CollectionUtils.isEmpty(results)){
-
-            if(CollectionUtils.isEmpty(studentIds)){
-                studentIds = results.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
-            }
+            List<Integer> allStudentIds = new ArrayList<>();
+            allStudentIds = results.stream().map(StudentExtracurricularExercisesSituation::getStudentId).collect(Collectors.toList());
 
             Map<Integer, List<StudentServeCourseHomeworkDto>> studentHomeworkMap=new HashMap<>();
             Map<Integer, List<ExtracurricularExercisesReply>> studentExercisesMap=new HashMap<>();
 
-            List<StudentServeCourseHomeworkDto> allStudentHomeworks = studentCourseHomeworkDao.findStudentHomeworkWithCourseDateRange(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(studentIds));
+            List<StudentServeCourseHomeworkDto> allStudentHomeworks = studentCourseHomeworkDao.findStudentHomeworkWithCourseDateRange(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds));
             List<StudentServeCourseHomeworkDto> studentHomeworksTmp =new ArrayList<>();
             for (StudentServeCourseHomeworkDto studentHomework : allStudentHomeworks) {
                 LocalDate courseStartLocalDate = LocalDateTime.ofInstant(studentHomework.getCourseStartTime().toInstant(), DateUtil.zoneId).toLocalDate();
@@ -578,7 +576,7 @@ public class StudentServeServiceImpl implements StudentServeService {
             }
 
 
-            List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(studentIds));
+            List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds));
             if(!CollectionUtils.isEmpty(allStudentExercises)){
                 studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
             }

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

@@ -116,92 +116,90 @@ public class IndexController extends BaseController {
 	}
 
 	@GetMapping("/newIndex")
-	public HttpResponseResult newIndex(String dataTypes, String organIds, Integer year){
+	public HttpResponseResult newIndex(String dataTypes, String organId, Integer year){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getIndexBaseData(dataTypes , organIds, year));
+		return succeed(indexService.getIndexBaseData(dataTypes , organId, year));
 	}
 
-
-
 	@GetMapping("/hasIndexErrData")
-	public HttpResponseResult hasIndexErrData(String organIds){
+	public HttpResponseResult hasIndexErrData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.hasIndexErrData(organIds));
+		return succeed(indexService.hasIndexErrData(organId));
 	}
 
 	@GetMapping("/getIndexErrData")
-	public HttpResponseResult getIndexErrData(String organIds){
+	public HttpResponseResult getIndexErrData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getIndexErrData(organIds));
+		return succeed(indexService.getIndexErrData(organId));
 	}
 
 	@GetMapping("/getRemindMatterData")
-	public HttpResponseResult getRemindMatterData(String organIds){
+	public HttpResponseResult getRemindMatterData(String organId){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
 		if (!sysUser.getIsSuperAdmin()) {
 			Employee employee = employeeService.get(sysUser.getId());
-			if (StringUtils.isBlank(organIds)) {
-				organIds = employee.getOrganIdList();
+			if (StringUtils.isBlank(organId)) {
+				organId = employee.getOrganIdList();
 			}else if(StringUtils.isEmpty(employee.getOrganIdList())){
 				return failed("用户所在分部异常");
 			}else {
 				List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-				if(!list.containsAll(Arrays.asList(organIds.split(",")))){
+				if(!list.containsAll(Arrays.asList(organId.split(",")))){
 					return failed("非法请求");
 				}
 			}
 		}
-		return succeed(indexService.getRemindMatterData(organIds));
+		return succeed(indexService.getRemindMatterData(organId));
 	}
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
@@ -10,6 +11,7 @@ import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.StudentApplyRefunds.StudentApplyRefundsStatus;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.VipGroupStatusEnum;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
@@ -51,6 +53,8 @@ public class VipGroupManageController extends BaseController {
     private TeacherDao teacherDao;
     @Autowired
     private EmployeeDao employeeDao;
+    @Autowired
+    private ClassGroupDao classGroupDao;
 
     @Autowired
     private StudentApplyRefundsService studentApplyRefundsService;
@@ -70,8 +74,8 @@ public class VipGroupManageController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/update')")
     public HttpResponseResult update(VipGroup vipGroup){
+        VipGroup oldVipGroup = vipGroupService.get(vipGroup.getId());
         if(Objects.nonNull(vipGroup.getCoursesExpireDate())){
-            VipGroup oldVipGroup = vipGroupService.get(vipGroup.getId());
             if(Objects.isNull(oldVipGroup)){
                 throw new BizException("此课程组不存在");
             }
@@ -79,6 +83,18 @@ public class VipGroupManageController extends BaseController {
                 throw new BizException("此课程组状态暂不支持修改");
             }
         }
+        if(Objects.isNull(oldVipGroup.getVipGroupActivityId())){
+            if(VipGroupStatusEnum.PROGRESS.equals(vipGroup.getStatus())&&oldVipGroup.getStatus().getCode()>VipGroupStatusEnum.PROGRESS.getCode()){
+                throw new BizException("此课程组状态暂不支持修改");
+            }
+            ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(oldVipGroup.getId().toString(), ClassGroupTypeEnum.VIP.getCode());
+            if(Objects.isNull(classGroup)){
+                throw new BizException("课程信息错误");
+            }
+            if(classGroup.getStudentNum()<3){
+                throw new BizException("班级人数未达到3人");
+            }
+        }
         vipGroupService.update(vipGroup);
         return succeed();
     }