Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SimpleUserDto.java

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.auth.api.entity.SysUser;
-import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 
@@ -29,8 +28,27 @@ public class SimpleUserDto {
 
     private String phone;
 
+    private String organIds;
+
+    private String[] organIdList;
+
     private BigDecimal actualAmount;
 
+    public String getOrganIds() {
+        return organIds;
+    }
+
+    public void setOrganIds(String organIds) {
+        this.organIds = organIds;
+        if(StringUtils.isNotEmpty(organIds)){
+            this.organIdList = organIds.split(",");
+        }
+    }
+
+    public String[] getOrganIdList() {
+        return organIdList;
+    }
+
     public BigDecimal getActualAmount() {
         return actualAmount;
     }

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

@@ -3528,7 +3528,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public Object queryStudentPaymentCalenders(MergeClassSplitClassAffirmDto mergeClassSplitClassAffirmDto) {
-        List<Map<String, Integer>> subCourseNumMap = courseScheduleDao.querySubCourseNumMap(mergeClassSplitClassAffirmDto.getMasterClassGroupId());
+        ArrayList masterClassGroupId = new ArrayList();
+        masterClassGroupId.add(mergeClassSplitClassAffirmDto.getMasterClassGroupId());
+        //获取主班最大可排课时长
+        Map<String, Long> masterMap = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(masterClassGroupId));
+        //获取其他班级最大可排课时长
+        Map<String, Long> subMap = MapUtil.convertIntegerMap(courseScheduleDao.findClassMaxCourseNumMap(mergeClassSplitClassAffirmDto.getClassGroupIds()));
+        Set<String> masterKeySet = masterMap.keySet();
+        for (String s : masterKeySet) {
+
+        }
         return null;
     }
 

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

@@ -260,13 +260,13 @@ 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);
+//		imFeignService.groupBatchQuit(groupModels);
 		//更换教务老师等数据
-		employeeDao.employeeLevel(employeeLevelDtos);
+//		employeeDao.employeeLevel(employeeLevelDtos);
 		//新增离职时间
 		employeeDao.updateUserDemissionDate(levelUserId);
 	}

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

@@ -251,10 +251,10 @@
     </select>
 
     <select id="findByRole" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
-        SELECT
-          DISTINCT su.id_ userId,
+        SELECT DISTINCT su.id_ userId,
           su.real_name_ userName,
-          su.avatar_ avatar
+          su.avatar_ avatar,
+            e.organ_id_list_ organIds
         FROM
             sys_user su
             LEFT JOIN sys_user_role sur ON su.id_ = sur.user_id_

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

@@ -192,7 +192,7 @@ public class EmployeeController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('employee/findTechnician')")
     public HttpResponseResult findTechnician(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        String organIds=new String();
+        String organIds = new String();
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
@@ -205,24 +205,6 @@ 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')")