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

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

@@ -4015,6 +4015,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/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/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -959,4 +959,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/StudentVisitMapper.xml

@@ -106,7 +106,7 @@
     <sql id="queryPageSql">
         <where>
             <if test="search != null and search != ''">
-                AND (sv.object_id_ = #{teacher} OR t.id_ = #{teacher} OR s.id_ = #{student} OR t.real_name_ LIKE CONCAT('%',#{teacher},'%') OR s.username_ LIKE CONCAT('%',#{student},'%'))
+                AND (sv.object_id_ = #{search} OR t.id_ = #{search} OR s.id_ = #{search} OR t.real_name_ LIKE CONCAT('%',#{search},'%') OR s.username_ LIKE CONCAT('%',#{search},'%'))
             </if>
             <if test="teacher != null and teacher != ''">
                 AND (t.id_ = #{teacher} OR t.real_name_ LIKE CONCAT('%',#{teacher},'%'))