Merge remote-tracking branch 'origin/saas' into saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/dal/dao/SysUserDeviceDao.java

@@ -11,7 +11,7 @@ public interface SysUserDeviceDao extends BaseDAO<Integer, SysUserDevice> {
 
 	List<SysUserDevice> queryByUserId(@Param("clientId") String clientId, @Param("userId") Integer userId);
 
-	List<SysUserDevice> queryByDeviceNum(@Param("clientId") String clientId, @Param("deviceNum") String deviceNum);
+	List<SysUserDevice> queryByDeviceNum(@Param("clientId") String clientId, @Param("deviceNum") String deviceNum, @Param("tenantId") Integer tenantId);
 
 	String getDeviceConfig(@Param("paramName") String paramName, @Param("tenantId") Integer tenantId);
 }

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

@@ -9,7 +9,7 @@ public interface SysUserDeviceService extends BaseService<Integer, SysUserDevice
 
 	List<SysUserDevice> queryByUserId(String clientId, Integer userId);
 
-	List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum);
+	List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum, Integer tenantId);
 
 	/**
 	 * 绑定设备号

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

@@ -33,8 +33,8 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 	}
 
 	@Override
-	public List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum) {
-		return sysUserDeviceDao.queryByDeviceNum(clientId, deviceNum);
+	public List<SysUserDevice> queryByDeviceNum(String clientId, String deviceNum, Integer tenantId) {
+		return sysUserDeviceDao.queryByDeviceNum(clientId, deviceNum, tenantId);
 	}
 
 	@Override
@@ -77,7 +77,7 @@ public class SysUserDeviceServiceImpl extends BaseServiceImpl<Integer, SysUserDe
 			}
 		} else {
 			// 查询设备号是否已存在
-			List<SysUserDevice> sysUserDeviceList = sysUserDeviceDao.queryByDeviceNum(null, deviceNum);
+			List<SysUserDevice> sysUserDeviceList = sysUserDeviceDao.queryByDeviceNum(null, deviceNum, tenantId);
 
 			if (sysUserDeviceList == null) {
 				sysUserDeviceList = new ArrayList<SysUserDevice>();

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

@@ -17,11 +17,10 @@ import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 	
-	public PageInfo<ClassGroup> queryPage(ClassGroupQueryInfo queryInfo);
+	PageInfo<ClassGroup> queryPage(ClassGroupQueryInfo queryInfo);
 	
 	boolean create(ClassGroup classGroup);
 

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

@@ -8,8 +8,6 @@ import com.ym.mec.biz.dal.page.ExportTeacherSalaryQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherIncomeQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
-import org.apache.poi.ss.formula.functions.T;
-
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;

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

@@ -152,15 +152,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @Autowired
     private MusicGroupPaymentCalenderDetailDao musicGroupPaymentCalenderDetailDao;
     @Autowired
-    private EmployeeDao employeeDao;
-    @Autowired
     private MusicGroupQuitDao musicGroupQuitDao;
     @Autowired
     private MusicGroupSchoolTermStudentCourseDetailDao musicGroupSchoolTermStudentCourseDetailDao;
     @Autowired
     private MusicGroupSchoolTermCourseDetailDao musicGroupSchoolTermCourseDetailDao;
-    @Autowired
-    private OrganizationService organizationService;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -206,6 +202,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup.getGroupType() == null) {
             throw new BizException("课程组类型不能为空");
         }
+        List<ClassGroupTeacherMapper> teacherMappers = classGroup.getTeacherMapperList();
+        Set<Integer> collect = teacherMappers.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+        if(teacherMappers.size() != collect.size()){
+            throw new BizException("主教与助教存在冲突");
+        }
 
         //基础技能班和线上基础技能班，可分班原则为声部人数/6向上取整
         if (classGroup.getType().equals(HIGH_ONLINE) || classGroup.getType().equals(HIGH)) {

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

@@ -1,40 +1,15 @@
 package com.ym.mec.web.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.auth.api.entity.SysUserRole;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.Employee;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
-import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
-import com.ym.mec.biz.service.OrganizationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
+import com.ym.mec.biz.dal.dto.HighClassGroupDto;
+import com.ym.mec.biz.dal.dto.MergeClassSplitClassAffirmDto;
+import com.ym.mec.biz.dal.dto.TestDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
@@ -43,10 +18,22 @@ import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupCourseScheduleQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @RequestMapping("classGroup")
 @Api(tags = "班级服务")