update

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.page.CourseDetailQueryInfo;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -1954,4 +1955,10 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     * @date 2022/9/6 14:07
     */
     void markFreeCourse(@Param("courseIds") String courseIds);
+    
+    /**
+     * 查询已开课乐团列表
+     * @return
+     */
+    List<String> queryStartedCourseMusicGroupIdList(String groupType);
 }

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

@@ -4070,6 +4070,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     public List<Long> updateCourseScheduleToOverStatus() {
 
         Date date = new Date();
+        //查询所有已上课乐团
+        List<String> musicGroupIdList = courseScheduleDao.queryStartedCourseMusicGroupIdList(GroupType.MUSIC.getCode());
+        
         //自动更新课程状态至“已结束”
         List<CourseSchedule> list = courseScheduleDao.queryFinishedWithNoUpdateStatus();
 
@@ -4090,6 +4093,21 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             if (courseSchedule.getGroupType() == GroupType.VIP) {
                 courseScheduleIdList.add(courseSchedule.getId());
             }
+            
+            if(courseSchedule.getGroupType() == GroupType.MUSIC){
+            	if(!musicGroupIdList.contains(courseSchedule.getMusicGroupId())){
+            		//乐团第一次上课
+            		MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+            		if(musicGroup != null){
+            			musicGroup.setFirstCourseStartTime(courseSchedule.getClassDate());
+            			musicGroup.setGroupMemberNum(courseScheduleStudentPaymentDao.countStudentNum(courseSchedule.getId()));
+            			
+            			musicGroupDao.update(musicGroup);
+            		}
+            		
+            		musicGroupIdList.add(courseSchedule.getMusicGroupId());
+            	}
+            }
         }
 
 		if (updateList.size() > 0) {

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

@@ -1499,8 +1499,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //获取所有已缴费学员人数
         List<StudentRegistration> studentRegistrations = studentRegistrationDao.queryStudentByMusicGroupId(musicGroupId);
         studentRegistrationDao.updateOriginalFlag(musicGroupId);
-        musicGroup.setGroupMemberNum(studentRegistrations == null ? 0 : studentRegistrations.size());
-        musicGroup.setBillStartDate(new Date());
+        //musicGroup.setGroupMemberNum(studentRegistrations == null ? 0 : studentRegistrations.size());
+        //musicGroup.setBillStartDate(new Date());
         musicGroupDao.update(musicGroup);
         //获取乐团班级列表
         List<ClassGroup> classGroups = classGroupDao.queryClassGroups(musicGroupId, "MUSIC");
@@ -1592,6 +1592,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //记录操作日志
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "审核通过（审核中 -> 预报名）", sysUser.getId(), ""));
         musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
+        musicGroup.setBillStartDate(new Date());
         musicGroupDao.update(musicGroup);
 
         // 创建群

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

@@ -4079,4 +4079,8 @@
             </if>
         </if>
     </select>
+    
+    <select id="queryStartedCourseMusicGroupIdList" resultType="java.lang.String">
+		select distinct cs.music_group_id_ from course_schedule cs where cs.group_type_ = #{groupType} and cs.status_ = 'OVER'
+    </select>
 </mapper>

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

@@ -3027,7 +3027,7 @@ public class ExportController extends BaseController {
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"老师姓名", "所属分部",
                     "角色", "学生编号", "学生姓名", "回访类型", "回访目的", "问题状态","回访图片", "回访时间"}, new String[]{
-                    "teacherName", "organName", "visiterType.msg", "studentId", "studentName", "type", "purpose","probStatus == 1 ? '已解决' : '未解决'",
+                    "teacherName", "organName", "visiterType.msg", "studentId", "studentName", "type", "purpose","probStatus == 1 ? '已解决' : '待跟进'",
                     "attachments", "visitTime"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attac:wq" +