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

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/service/impl/ClassGroupServiceImpl.java

@@ -4018,7 +4018,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //主班是否有报名状态的学员
         StudentRegistration studentRegistration = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
         if (studentRegistration != null) {
-            throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并，请将该学员退团处理后再次合并",
+            throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并",
                     studentRegistration.getName(),studentRegistration.getUserId(),musicGroup.getName());
         }
         //获取缴费状态在审核中或者已拒绝的缴费项目的学员

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/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},