活动排课

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

@@ -24,6 +24,8 @@ public interface StudentManageService {
 
     PageInfo<SimpleUserDto> queryStudentsWithTeacher(StudentManageQueryInfo queryInfo);
 
+    PageInfo<SimpleUserDto> queryStudentsWithTeacherByOrganId(StudentManageQueryInfo queryInfo);
+
     /**
      * @describe 双11活动学员查询
      * @author qnc99

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

@@ -255,6 +255,38 @@ public class StudentManageServiceImpl implements StudentManageService {
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+    @Override
+    public PageInfo<SimpleUserDto> queryStudentsWithTeacherByOrganId(StudentManageQueryInfo queryInfo) {
+        PageInfo<SimpleUserDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        Teacher teacher = teacherDao.get(queryInfo.getTeacherId());
+        if (Objects.isNull(teacher)) {
+            return null;
+        }
+        List<Integer> organIds = new ArrayList<>();
+        if (Objects.nonNull(teacher.getTeacherOrganId())) {
+            organIds.add(teacher.getTeacherOrganId());
+        }
+        if (CollectionUtils.isEmpty(organIds)) {
+            return null;
+        }
+        params.put("organIds", organIds);
+
+        List<SimpleUserDto> dataList = null;
+        int count = studentDao.countStudentsWithOrgan(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = studentDao.getStudentsWithOrgan(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 
     @Override
     public PageInfo<StudentVipDouble11Dto> queryDouble11Students(StudentManageQueryInfo queryInfo) {

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

@@ -2826,7 +2826,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				List<TeacherAttendance> teacherAttendances = new ArrayList<>();
 				//创建课酬信息
 				List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
-				ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroup.getId().intValue(), vipGroup.getUserId());
+				Map<String, BigDecimal> stringBigDecimalMap = countVipGroupPredictFee1(vipGroup, vipGroup.getUserId(), null);
 				for (CourseSchedule courseSchedule : courseSchedules) {
 					//创建教师课程薪水记录
 					CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
@@ -2836,7 +2836,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					courseScheduleTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
 					courseScheduleTeacherSalary.setUserId(courseSchedule.getActualTeacherId().intValue());
 					courseScheduleTeacherSalary.setClassGroupId(courseSchedule.getClassGroupId());
-					courseScheduleTeacherSalary.setExpectSalary(classGroupTeacherSalary.getSalary());
+					courseScheduleTeacherSalary.setExpectSalary(stringBigDecimalMap.get("offlineTeacherSalary"));
 					courseScheduleTeacherSalary.setActualSalary(null);
 					courseScheduleTeacherSalaries.add(courseScheduleTeacherSalary);
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -166,6 +166,17 @@ public class TeacherVipGroupController extends BaseController {
 		return succeed(studentManageService.queryStudentsWithTeacher(queryInfo));
 	}
 
+	@ApiOperation(value = "获取教师所在分部学生列表")
+	@GetMapping("/queryStudentsWithTeacherByOrganId")
+	public Object queryStudentsWithTeacherByOrganId(StudentManageQueryInfo queryInfo){
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (Objects.isNull(user)) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		queryInfo.setTeacherId(user.getId());
+		return succeed(studentManageService.queryStudentsWithTeacherByOrganId(queryInfo));
+	}
+
 	@ApiOperation(value = "获取参与双十一活动学员列表")
 	@GetMapping("/queryDouble11Students")
 	public HttpResponseResult queryDouble11Students(StudentManageQueryInfo queryInfo){