员工离职、合班

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

@@ -507,4 +507,11 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     Object queryStudentPaymentCalenders(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto);
+
+    /**
+     * 获取班级列表最大可排课时长
+     * @param classGroupIds
+     * @return
+     */
+    Map<String,Long> querySubCourseTime(List<Integer> classGroupIds);
 }

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

@@ -3531,4 +3531,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<Map<String, Integer>> subCourseNumMap = courseScheduleDao.querySubCourseNumMap(mergeClassSplitClassAffirmDto.getMasterClassGroupId());
         return null;
     }
+
+    @Override
+    public Map<String, Long> querySubCourseTime(List<Integer> classGroupIds) {
+        return MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(classGroupIds));
+    }
 }

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

@@ -260,13 +260,14 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 					imGroupModel.setMembers(memberList.toArray(imGroupMembers));
 				}
 			}
-//		imFeignService.groupBatchJoin(imGroupModels);
+		imFeignService.groupBatchJoin(imGroupModels);
 		}
 		//原有员工退群
 		List<ImGroupModel> groupModels = classGroupDao.queryTeacherQuitGroups(levelUserId);
-//		imFeignService.groupBatchQuit(groupModels);
-//		employeeDao.employeeLevel(employeeLevelDtos);
-		//用户退群和加群
-//		employeeDao.updateUserDemissionDate(levelUserId);
+		imFeignService.groupBatchQuit(groupModels);
+		//更换教务老师等数据
+		employeeDao.employeeLevel(employeeLevelDtos);
+		//新增离职时间
+		employeeDao.updateUserDemissionDate(levelUserId);
 	}
 }

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -3380,7 +3380,7 @@
         SELECT COUNT(id_) FROM course_schedule WHERE new_course_id_=#{courseId}
     </select>
     <select id="querySubCourseNumMap" resultType="java.util.Map">
-        SELECT cs.type_ 'key',COUNT(CASE WHEN (CONCAT(cs.class_date_," ",cs.start_class_time_) > NOW()) THEN 1 ELSE NULL END) 'value' FROM course_schedule cs
+        SELECT cs.type_ 'key',COUNT(CASE WHEN (CONCAT(cs.class_date_,' ',cs.start_class_time_) > NOW()) THEN 1 ELSE NULL END) 'value' FROM course_schedule cs
         WHERE cs.class_group_id_ = #{classGroupId}
         GROUP BY cs.type_
     </select>

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

@@ -330,7 +330,6 @@ public class ClassGroupController extends BaseController {
     @GetMapping("/queryRemainCourseTypeDuration")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryRemainCourseTypeDuration')")
     public HttpResponseResult queryRemainCourseTypeDuration(String classGroupIdList) {
-
         return succeed(classGroupService.queryRemainCourseTypeDuration(classGroupIdList));
     }
 
@@ -341,6 +340,13 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.classGroupSubCourseNum(classGroupId));
     }
 
+    @ApiOperation(value = "进行中乐团-修改-班级详情-学员班级调整-获取班级最大剩余可排课时长")
+    @GetMapping("/querySubCourseTime")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/querySubCourseTime')")
+    public HttpResponseResult querySubCourseTime(@RequestBody List<Integer> classGroupIds) {
+        return succeed(classGroupService.querySubCourseTime(classGroupIds));
+    }
+
     @ApiOperation(value = "进行中乐团-修改-班级详情-班级合并-获取学员需要补交的费用以及需要退还的课程余额")
     @GetMapping("/queryStudentPaymentCalenders")
     @PreAuthorize("@pcs.hasPermissions('classGroup/queryStudentPaymentCalenders')")

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

@@ -205,6 +205,24 @@ public class EmployeeController extends BaseController {
         return succeed(employeeService.findByRole("37",organIds));
     }
 
+    @ApiOperation(value = "根据角色编号获取员工列表")
+    @GetMapping("/findEmployeeByRole")
+    @PreAuthorize("@pcs.hasPermissions('employee/findEmployeeByRole')")
+    public HttpResponseResult findEmployeeByRole(String roleId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        String organIds=new String();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if (!sysUser.getIsSuperAdmin()) {
+            Employee employee = employeeService.get(sysUser.getId());
+            if (StringUtils.isEmpty(organIds)) {
+                organIds=employee.getOrganIdList();
+            }
+        }
+        return succeed(employeeService.findByRole(roleId,organIds));
+    }
+
     @ApiOperation(value = "获取所选用户离职所需交接信息")
     @GetMapping("/levelDetail")
     @PreAuthorize("@pcs.hasPermissions('employee/levelDetail')")