Merge remote-tracking branch 'origin/2021-04-28' into 2021-04-28

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/IndexBaseMonthDataDao.java

@@ -168,7 +168,9 @@ public interface IndexBaseMonthDataDao extends BaseDAO<Long, IndexBaseMonthData>
 
     List<Map<Integer, Integer>> getOrganNoClassMusicGroupStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
 
-    int countNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
+    int countNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds,
+                                 @Param("educationUserId") Integer educationUserId,
+                                 @Param("noPaymentType") Integer noPaymentType);
 
     List<Map<Integer, Integer>> countOrganNoPaymentStudentNum(@Param("organIds") Set<Integer> organIds, @Param("educationUserId") Integer educationUserId);
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -507,4 +507,12 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @return
      */
     Integer getPaymentStudentNum(@Param("musicGroupId") String musicGroupId);
+
+    /**
+     * 查找报名中的学员
+     * @param musicGroupId
+     * @param studentIds
+     * @return
+     */
+    StudentRegistration findApplyStudent(@Param("musicGroupId") String musicGroupId, @Param("studentIds") List<Integer> studentIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -500,4 +500,6 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     String queryTeacherNameByTeacherIds(@Param("teachingTeacherIds") String teachingTeacherIds);
 
     List<Integer> queryAllIds();
+
+    void eduUpdateTeacher(Teacher teacher);
 }

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

@@ -45,6 +45,16 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "学生在学状态",required = false)
     private StudentAttendanceStatusEnum status;
 
+    private Boolean beMerged;
+
+    public Boolean getBeMerged() {
+        return beMerged;
+    }
+
+    public void setBeMerged(Boolean beMerged) {
+        this.beMerged = beMerged;
+    }
+
     public String getPaymentStatus() {
         return paymentStatus;
     }

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

@@ -16,6 +16,8 @@ public class StudentClassInfoDto {
 
     private Integer mainTeacherId;
 
+    private Integer cooperationOrganId;
+
     public Integer getStudentId() {
         return studentId;
     }
@@ -52,6 +54,14 @@ public class StudentClassInfoDto {
         return mainTeacherId;
     }
 
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
     public void setMainTeacherId(Integer mainTeacherId) {
         this.mainTeacherId = mainTeacherId;
     }

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

@@ -98,6 +98,26 @@ public class StudentManageListDto {
     @ApiModelProperty(value = "0 - 6+3年制    1 - 5+4年制")
     private GradeTypeEnum gradeType;
 
+    private Integer cooperationOrganId;
+
+    private String cooperationOrganName;
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
+    public String getCooperationOrganName() {
+        return cooperationOrganName;
+    }
+
+    public void setCooperationOrganName(String cooperationOrganName) {
+        this.cooperationOrganName = cooperationOrganName;
+    }
+
     public String getContractVersions() {
         return contractVersions;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -54,6 +54,8 @@ public class Student extends SysUser {
 	@ApiModelProperty(value = "班级")
 	private String currentClass;
 
+	private Integer cooperationOrganId;
+
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
 		this.subjectIdList = subjectIdList;
@@ -184,6 +186,14 @@ public class Student extends SysUser {
 		this.currentGradeNum = currentGradeNum;
 	}
 
+	public Integer getCooperationOrganId() {
+		return cooperationOrganId;
+	}
+
+	public void setCooperationOrganId(Integer cooperationOrganId) {
+		this.cooperationOrganId = cooperationOrganId;
+	}
+
 	@Override
 	public String getCurrentClass() {
 		return currentClass;

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/IndexErrorType.java

@@ -13,6 +13,7 @@ public enum IndexErrorType implements BaseEnum<String, IndexErrorType> {
     NO_CLASS_MUSIC_GROUP_STUDENT_INFO("NO_CLASS_MUSIC_GROUP_STUDENT_INFO", "当前有{0}个乐团共{1}名学员未加入任何班级"),
 
     STUDENT_INFO("STUDENT_INFO", "学员处理"),
+    STUDENT_ARREARAGE("STUDENT_ARREARAGE", "欠费学员数"),
     STUDENT_NOT_PAYMENT("STUDENT_NOT_PAYMENT", "未缴费学员数"),
     STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP("STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP", "申请退团学员数"),
     WAIT_CREATE_PAYMENT_CALENDER("WAIT_CREATE_PAYMENT_CALENDER", "待创建缴费项目"),

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ArrearageStudentsQueryInfo.java

@@ -18,6 +18,9 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
 
     private Integer eduTeacherId;
 
+    @ApiModelProperty(value = "未缴费类型：0历史，1进行中")
+    private Integer noPaymentType;
+
     public String getOrganIds() {
         return organIds;
     }
@@ -49,4 +52,12 @@ public class ArrearageStudentsQueryInfo extends QueryInfo {
     public void setEduTeacherId(Integer eduTeacherId) {
         this.eduTeacherId = eduTeacherId;
     }
+
+    public Integer getNoPaymentType() {
+        return noPaymentType;
+    }
+
+    public void setNoPaymentType(Integer noPaymentType) {
+        this.noPaymentType = noPaymentType;
+    }
 }

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

@@ -1730,8 +1730,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
                 Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
-                    studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                    studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                   if(Objects.nonNull(studentAttendanceViewDto.getBeMerged())&&studentAttendanceViewDto.getBeMerged()){
+                       studentAttendanceViewDto.setSubjectName("被合并学员");
+                   }else{
+                       studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                       studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
+                   }
                 });
             } else if (schedule.getGroupType() != MUSIC) {
                 ClassGroup classGroup = classGroupDao.get(schedule.getClassGroupId());
@@ -4015,6 +4019,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 studentIds);
         //创建缴费项目
         MusicGroup musicGroup = musicGroupDao.findByClassGroupId(masterClassGroupId);
+        //主班是否有报名状态的学员
+        StudentRegistration studentRegistration = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
+        if (studentRegistration != null) {
+            throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并",
+                    studentRegistration.getName(),studentRegistration.getUserId(),musicGroup.getName());
+        }
         //获取缴费状态在审核中或者已拒绝的缴费项目的学员
         String studentId = musicGroupPaymentCalenderDao.queryCalenderStudentIds(musicGroup.getId(), null);
         if (StringUtils.isNotEmpty(studentId)) {

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

@@ -244,7 +244,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 					IndexDataType.VIP_GROUP_OFFLINE_COURSE.equals(typeDateMapEntry.getKey())){
 				for (IndexBaseMonthData indexBaseMonthData : indexBaseData.getIndexMonthData()) {
 					if(vipCategoryCourseListMap.containsKey(indexBaseMonthData.getMonth())&&vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).containsKey(indexBaseData.getDataType())){
-						indexBaseMonthData.setExtendInfo(JSON.toJSONString(vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).get(indexBaseData.getDataType())));
+						TreeMap<String, Integer> extendSortMap = new TreeMap<>(vipCategoryCourseListMap.get(indexBaseMonthData.getMonth()).get(indexBaseData.getDataType()));
+						indexBaseMonthData.setExtendInfo(JSON.toJSONString(extendSortMap));
 					}
 				}
 			}
@@ -331,8 +332,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		saveData(vipCourseData, dayStr, IndexDataType.VIP_GROUP_COURSE);
 
 
-		List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, null);
-		List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, null);
+		List<IndexBaseMonthData> vipOnlineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, TeachModeEnum.ONLINE);
+		List<OrganVipGroupCategoryCourseNumDto> vipGroupOnlineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, TeachModeEnum.ONLINE);
 		Map<Integer, Map<String, Integer>> organOnlineCategoryCourseMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(vipGroupOnlineCategoryCourseData)){
 			organOnlineCategoryCourseMap = vipGroupOnlineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -345,8 +346,8 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		saveData(vipOnlineCourseData, dayStr, IndexDataType.VIP_GROUP_ONLINE_COURSE);
 
 
-		List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, null);
-		List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, null);
+		List<IndexBaseMonthData> vipOfflineCourseData = indexBaseMonthDataDao.getGroupCourseDataWithGroup(dayStr, GroupType.VIP, null, TeachModeEnum.OFFLINE);
+		List<OrganVipGroupCategoryCourseNumDto> vipGroupOfflineCategoryCourseData = indexBaseMonthDataDao.getVipGroupCategoryCourseData(dayStr, GroupType.VIP, null, TeachModeEnum.OFFLINE);
 		Map<Integer, Map<String, Integer>> organOfflineCategoryCourseMap = new HashMap<>();
 		if(!CollectionUtils.isEmpty(vipGroupOfflineCategoryCourseData)){
 			organOfflineCategoryCourseMap = vipGroupOfflineCategoryCourseData.stream().collect(Collectors.groupingBy(OrganVipGroupCategoryCourseNumDto::getOrganId, Collectors.toMap(OrganVipGroupCategoryCourseNumDto::getCategoryName, o -> o.getCourseNum())));
@@ -462,7 +463,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			List<IndexErrInfoDto> twoChild = new ArrayList<>();
 
 			//未缴费学员数
-			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_NOT_PAYMENT, IndexErrorType.STUDENT_NOT_PAYMENT.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId), Arrays.asList(educationUserId)));
+			twoChild.add(new IndexErrInfoDto(IndexErrorType.STUDENT_ARREARAGE, IndexErrorType.STUDENT_ARREARAGE.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId,0), Arrays.asList(educationUserId)));
 
 			//申请退团学员数
 			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId);
@@ -521,12 +522,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				noAttendance = indexBaseMonthDataDao.getNoAttendance(organIds,startTime,classGroupIds);
 				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
 			}
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			//全职未离职老师
-			//预计课酬较低
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
-
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.COURSE_TIME_ERROR, IndexErrorType.COURSE_TIME_ERROR.getMsg(), courseTimeError, null));
 
 			fourChild.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE, IndexErrorType.TEACHER_EXCEPTION_ATTENDANCE.getMsg(), attendanceError, null));
@@ -795,6 +790,12 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		if (sysUser == null) {
 			throw new BizException("用户信息获取失败");
 		}
+
+		Set<Integer> organIdSet = null;
+		if(StringUtils.isNotBlank(organIds)){
+			organIdSet = Arrays.stream(organIds.split(",")).map(Integer::new).collect(Collectors.toSet());
+		}
+
 		//当前用户是否是分部经理
 		List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
 		Integer educationUserId = null;
@@ -819,6 +820,18 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			}
 		}
 		result.add(indexErrInfoDto);
+
+		//未缴费学员数
+		result.add(new IndexErrInfoDto(IndexErrorType.STUDENT_NOT_PAYMENT, IndexErrorType.STUDENT_NOT_PAYMENT.getMsg(), indexBaseMonthDataDao.countNoPaymentStudentNum(organIdSet,educationUserId, 1), Arrays.asList(educationUserId)));
+
+
+		String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+		//全职未离职老师
+		//预计课酬较低
+		int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIds,monthStr);
+		result.add(new IndexErrInfoDto(IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW, IndexErrorType.TEACHER_EXPECT_SALARY_BE_LOW.getMsg(),lowTeacherSalary, null));
+
+
 		return result;
 	}
 
@@ -862,7 +875,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		resultMap.put("musicPatrol",flag1);
 		boolean flag2 = false;
 		if(!flag2){
-			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId);
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
 			if(countNoPaymentStudentNum > 0){
 				flag2 = true;
 			}

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

@@ -227,6 +227,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             if(StringUtils.isBlank(student.getSubjectIdList())){
                 student.setSubjectIdList(studentClassInfoDto.getSubjectId().toString());
             }
+            if(Objects.isNull(student.getCooperationOrganId())){
+                student.setCooperationOrganId(studentClassInfoDto.getCooperationOrganId());
+            }
             needUpdateStudents.add(student);
         }
         if(!CollectionUtils.isEmpty(needUpdateStudents)){

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

@@ -38,6 +38,8 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
     @Autowired
     private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
     @Autowired
+    private CourseScheduleDao courseScheduleDao;
+    @Autowired
     private StudentAttendanceDao studentAttendanceDao;
 
 
@@ -75,6 +77,8 @@ public class StudentVisitServiceImpl extends BaseServiceImpl<Integer, StudentVis
                 studentAttendance.setUpdateTime(now);
                 studentAttendanceDao.update(studentAttendance);
             }
+            CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleStudentPayment.getCourseScheduleId());
+            studentVisit.setOrganId(courseSchedule.getOrganId());
         }
         studentVisitDao.insert(studentVisit);
         return studentVisit;

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

@@ -777,7 +777,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		teacherAttendance.setIsComplaints(1);
 		teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.WAIT);
 		teacherAttendance.setComplaintsContent(content);
-		teacherAttendance.setComplaintsTime(date);
+		teacherAttendance.setComplaintsTime(new Date());
 		teacherAttendance.setUrl(url);
 		teacherAttendanceDao.update(teacherAttendance);
 	}

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

@@ -154,7 +154,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		}
 		teacher.setUpdateTime(new Date());
 		teacher.setTeacherOrganId(teacher.getOrganId());
-		teacherDao.update(teacher);
+		teacherDao.eduUpdateTeacher(teacher);
 		teacher.setOrganId(null);
 		teacherDao.updateUser(teacher);
 		imGroupDao.updateNickname(teacher.getId(),teacher.getRealName());

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

@@ -196,6 +196,7 @@
             cssp.user_id_ student_id_,
             su.username_,
             su.avatar_,
+            cssp.be_merged_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp

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

@@ -771,7 +771,12 @@
 		LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
 		WHERE
 		mg.status_ = 'PROGRESS'
-		AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
+		<if test="noPaymentType==null or noPaymentType==0">
+			AND DATE_FORMAT(NOW(),'%Y-%m-%d') > mgpc.deadline_payment_date_
+		</if>
+		<if test="noPaymentType!=null and noPaymentType==1">
+			AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN mgpc.start_payment_date_ AND mgpc.deadline_payment_date_
+		</if>
 		AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
@@ -794,7 +799,7 @@
 		LEFT JOIN music_group mg ON mgpc.music_group_id_ = mg.id_
 		WHERE
 		mg.status_ = 'PROGRESS'
-		AND DATE_FORMAT(NOW(),'%Y-%m-%d') >= DATE_FORMAT(mgpc.payment_valid_start_date_,'%Y-%m-%d')
+		AND DATE_FORMAT(NOW(),'%Y-%m-%d') > mgpc.deadline_payment_date_
 		AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpcd.expect_amount_ > 0 AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}

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

@@ -425,7 +425,12 @@
 	<sql id="queryArrearageStudentsCondition">
 		<where>
 			mg.status_ = 'PROGRESS'
-			AND DATE_FORMAT( NOW(), '%Y-%m-%d' ) >= DATE_FORMAT( mgpc.payment_valid_start_date_, '%Y-%m-%d' )
+			<if test="noPaymentType==null or noPaymentType==0">
+				AND DATE_FORMAT(NOW(),'%Y-%m-%d') > mgpc.deadline_payment_date_
+			</if>
+			<if test="noPaymentType!=null and noPaymentType==1">
+				AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN mgpc.start_payment_date_ AND mgpc.deadline_payment_date_
+			</if>
 			AND mgpcd.payment_status_ = 'NON_PAYMENT' AND mgpc.batch_no_ IS NOT NULL AND mgpc.pay_user_type_ = 'STUDENT'
 			AND mgpcd.expect_amount_ > 0
 			<if test="organIds!=null and organIds.size()>0">

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

@@ -222,6 +222,7 @@
         <result property="subjectName" column="subject_name_"/>
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
+        <result property="beMerged" column="be_merged_"/>
         <result property="status" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 

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

@@ -68,6 +68,8 @@
         <result column="care_package_" property="carePackage"/>
         <result column="come_on_package_" property="comeOnPackage"/>
         <result column="grade_type_" property="gradeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
+        <result column="cooperation_organ_name_" property="cooperationOrganName"/>
     </resultMap>
 
     <sql id="queryCondition">
@@ -158,13 +160,15 @@
 		tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,
 		sub.`name_` music_group_subject_ ,su.birthdate_,s.subject_id_list_,s.teacher_id_,s.current_grade_num_,s.current_class_,
-        case when su.password_ is null then false else true end isActive_,s.is_new_user_,case when sut.user_id_ is null then 0 else 1 end is_signed_contract_
+        case when su.password_ is null then false else true end isActive_,s.is_new_user_,case when sut.user_id_ is null then 0 else 1 end is_signed_contract_,
+        s.cooperation_organ_id_,co.name_ cooperation_organ_name_
 		FROM `student` s LEFT JOIN `sys_user` su on s.`user_id_` = su.`id_`
 		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
 		LEFT JOIN `sys_user` tu on tu.`id_` = s.`teacher_id_` 
 		LEFT JOIN `sys_user_cash_account` suca on suca.`user_id_` = s.`user_id_`
 		LEFT JOIN `subject` sub on sub.id_ = s.`subject_id_list_`
 		left join sys_user_tsign sut on sut.user_id_ = s.user_id_
+        LEFT JOIN cooperation_organ co ON s.cooperation_organ_id_=co.id_
         <include refid="findStudentsByOrganIdSql"/>
         ORDER BY su.create_time_ DESC
         <include refid="global.limit"/>

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

@@ -21,6 +21,7 @@
         <result column="come_on_package_" property="comeOnPackage"/>
         <result column="current_grade_num_" property="currentGradeNum"/>
         <result column="current_class_" property="currentClass"/>
+        <result column="cooperation_organ_id_" property="cooperationOrganId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -65,7 +66,7 @@
         <if test="operatingTag != null">
             operating_tag_,
         </if>
-        teacher_id_,create_time_,update_time_,service_tag_update_time_)
+        teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_)
         VALUES
         (#{userId},#{subjectIdList},
         <if test="serviceTag != null">
@@ -74,7 +75,7 @@
         <if test="operatingTag != null">
             #{operatingTag},
         </if>
-        #{teacherId},NOW(),NOW(),NOW())
+        #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -111,6 +112,9 @@
             <if test="currentClass != null">
                 current_class_=#{currentClass},
             </if>
+            <if test="cooperationOrganId != null">
+                cooperation_organ_id_=#{cooperationOrganId},
+            </if>
                 update_time_ = NOW()
         </set>
         WHERE user_id_ = #{userId}
@@ -186,6 +190,9 @@
                 <if test="item.comeOnPackage != null">
                     come_on_package_=#{item.comeOnPackage},
                 </if>
+                <if test="item.cooperationOrganId != null">
+                    cooperation_organ_id_=#{item.cooperationOrganId},
+                </if>
                 update_time_ = NOW()
             </set>
             WHERE user_id_ = #{item.userId}
@@ -672,7 +679,7 @@
         </foreach>
     </select>
     <select id="getNoTeacherOrNoSubjectStudent" resultMap="Student">
-        SELECT * FROM student WHERE teacher_id_ IS NULL OR subject_id_list_ IS NULL;
+        SELECT * FROM student WHERE teacher_id_ IS NULL OR subject_id_list_ IS NULL OR cooperation_organ_id_ IS NULL;
     </select>
 
     <update id="updateGrade"><![CDATA[

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

@@ -941,7 +941,8 @@
                sr.music_group_id_ musicGroupId,
                sr.actual_subject_id_ subjectId,
                cgsm.class_group_id_ classGroupId,
-               cgtm.user_id_ mainTeacherId
+               cgtm.user_id_ mainTeacherId,
+               mg.cooperation_organ_id_ cooperationOrganId
         FROM student_registration sr
              LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
              LEFT JOIN class_group_student_mapper cgsm ON cgsm.group_type_='MUSIC' AND cgsm.music_group_id_=sr.music_group_id_ AND cgsm.user_id_=sr.user_id_
@@ -959,4 +960,13 @@
     <select id="getPaymentStudentNum" resultType="int">
         SELECT COUNT(*) FROM student_registration WHERE music_group_id_ = #{musicGroupId} AND payment_status_ = 2 AND music_group_status_ = 'NORMAL'
     </select>
+    <select id="findApplyStudent" resultMap="StudentRegistration">
+        SELECT * FROM student_registration
+        WHERE music_group_id_ = #{musicGroupId} AND music_group_status_ = 'APPLY'
+        AND user_id_ IN
+        <foreach collection="studentIds" item="studentId" open="(" close=")" separator=",">
+            #{studentId}
+        </foreach>
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -159,6 +159,80 @@
             <if test="lectureNum != null">
                 lecture_num_ = #{lectureNum},
             </if>
+            <if test="graduateSchool != null">
+                graduate_school_ = #{graduateSchool},
+            </if>
+            <if test="subjectId != null">
+                subject_id_ = #{subjectId},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="technicalTitles != null">
+                technical_titles_ = #{technicalTitles},
+            </if>
+            <if test="entryDate != null">
+                entry_date_ = #{entryDate},
+            </if>
+            <if test="jobType != null">
+                job_type_ = #{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="flowOrganRange != null">
+                flow_organ_range_ = #{flowOrganRange},
+            </if>
+            <if test="certificateType != null">
+                certificate_type_ = #{certificateType},
+            </if>
+            <if test="jobNature != null">
+                job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="isProbationPeriod != null">
+                is_probation_period_ = #{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = NOW(),
+            </if>
+            <if test="educationBackground != null">
+                education_background_ = #{educationBackground},
+            </if>
+            <if test="certificateNum != null">
+                certificate_num_ = #{certificateNum},
+            </if>
+            <if test="workUnit != null">
+                work_unit_ = #{workUnit},
+            </if>
+            <if test="introduction != null">
+                introduction_ = #{introduction},
+            </if>
+            <if test="isSupportCourseScheduleRewardsRules != null">
+                is_support_course_schedule_rewards_rules_ = #{isSupportCourseScheduleRewardsRules},
+            </if>
+            <if test="isSupportExtraPracticeLesson != null">
+                is_support_extra_practice_lesson_ = #{isSupportExtraPracticeLesson},
+            </if>
+            <if test="idcardFrontImg != null">
+                idcard_front_img_ = #{idcardFrontImg},
+            </if>
+            <if test="idcardBackImg != null">
+                idcard_back_img_ = #{idcardBackImg},
+            </if>
+            <if test="idcardHandImg != null">
+                idcard_hand_img_ = #{idcardHandImg},
+            </if>
+            <if test="isSettlementSalary != null">
+                is_settlement_salary_ = #{isSettlementSalary},
+            </if>
+        </set>
+        WHERE id_ = #{id}
+    </update>
+
+    <!-- 根据主键查询一条记录 -->
+    <update id="eduUpdateTeacher" parameterType="com.ym.mec.biz.dal.entity.Teacher">
+        UPDATE teacher
+        <set>
+            <if test="lectureNum != null">
+                lecture_num_ = #{lectureNum},
+            </if>
                 memo_ = #{memo},
             <if test="graduateSchool != null">
                 graduate_school_ = #{graduateSchool},

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

@@ -2595,7 +2595,7 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
 
         try {
-            String[] header = {"分部", "基础技能班学员数量异常", "乐团巡查事项异常", "未在班级学员数", "未缴费学员数",
+            String[] header = {"分部", "基础技能班学员数量异常", "乐团巡查事项异常", "未在班级学员数", "欠费学员数",
                     "申请退团学员数", "预计课酬较低", "课程时间安排异常", "乐团巡查未计划", "乐团巡查任务未提交",
                     "回访任务未完成", "课程考勤异常", "课程异常", "服务指标异常", "总计",};
             String[] body = {"organName", "highClassStudentLessThanThreeNum", "musicPatrolItem", "noClassMusicGroupStudentInfo", "studentNotPayment",