Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -16,6 +16,9 @@ public class TeacherAttendanceSumDto {
     @ApiModelProperty(value = "班级类型")
     private ClassGroupTypeEnum classGroupType;
 
+    @ApiModelProperty(value = "班级名称")
+    private String classGroupName;
+
     @ApiModelProperty(value = "班级编号")
     private Integer classGroupId;
 

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

@@ -149,11 +149,13 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 
         // 修改合作单位下的用户，改为锁定
 
-        List<SchoolStaff> schoolStaffs = schoolStaffMapper.getByCoopIdAndType(cooperationOrgan.getId(), null);
+        if (!cooperationOrgan.getIsEnable()) {
+            List<SchoolStaff> schoolStaffs = schoolStaffMapper.getByCoopIdAndType(cooperationOrgan.getId(), null);
 
 
-        for (SchoolStaff schoolStaff : schoolStaffs) {
-            sysUserFeignService.exitByPhone("education", sysUserService.queryUserById(schoolStaff.getUserId().intValue()).getPhone());
+            for (SchoolStaff schoolStaff : schoolStaffs) {
+                sysUserFeignService.exitByPhone("education", sysUserService.queryUserById(schoolStaff.getUserId().intValue()).getPhone());
+            }
         }
 
         schoolStaffMapper.updateStatusAndRecoveryStatus(cooperationOrgan.getIsEnable(), cooperationOrgan.getId());

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

@@ -627,7 +627,7 @@
         AND ta.sign_in_time_ IS NOT NULL ORDER BY ta.sign_in_time_ ASC LIMIT 1
     </select>
     <select id="queryTeacherAttendance" resultType="com.ym.mec.biz.dal.school.dto.TeacherAttendanceSumDto">
-        select cg.type_ classGroupType,cs.actual_teacher_id_ teacherId,
+        select cg.type_ classGroupType,cs.actual_teacher_id_ teacherId,cg.name_ classGroupName,
                cs.class_group_id_ classGroupId,su.avatar_ teacherAvatar,su.real_name_ teacherName
         from course_schedule cs
         left join class_group cg ON cg.id_ = cs.class_group_id_