Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserDeviceController.java

@@ -21,9 +21,6 @@ import com.yonge.log.model.AuditLogAnnotation;
 public class UserDeviceController extends BaseController {
 
 	@Autowired
-	private SysUserService sysUserService;
-	
-	@Autowired
 	private SysUserDeviceService sysUserDeviceService;
 
 	@ApiOperation(value = "分页查询用户信息")
@@ -34,7 +31,7 @@ public class UserDeviceController extends BaseController {
 
 	@ApiOperation(value = "设备号解除绑定")
 	@PostMapping(value = "/unbind")
-	@AuditLogAnnotation(operateName = "设备号解除绑定",interfaceURL = "userDevice/unbind")
+//	@AuditLogAnnotation(operateName = "设备号解除绑定",interfaceURL = "userDevice/unbind")
 	public Object unbind(Integer id) {
 		return succeed(sysUserDeviceService.deleteWithLogic(id));
 	}

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

@@ -36,6 +36,16 @@ public class EduHomeworkCardDto {
 
     private Date createTime;
 
+    private String musicScoreId;
+
+    public String getMusicScoreId() {
+        return musicScoreId;
+    }
+
+    public void setMusicScoreId(String musicScoreId) {
+        this.musicScoreId = musicScoreId;
+    }
+
     public String getTeacherAvatar() {
         return teacherAvatar;
     }

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

@@ -33,6 +33,9 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "年级",required = false)
     private Integer currentGradeNum;
 
+    @ApiModelProperty(value = "班级",required = false)
+    private String currentClass;
+
     @ApiModelProperty(value = "学生姓名",required = false)
     private String userName;
 
@@ -53,6 +56,14 @@ public class StudentAttendanceViewDto {
     @ApiModelProperty(value = "是否有待审核的退团申请",required = false)
     private Integer quitFlag;
 
+    public String getCurrentClass() {
+        return currentClass;
+    }
+
+    public void setCurrentClass(String currentClass) {
+        this.currentClass = currentClass;
+    }
+
     public Integer getQuitFlag() {
         return quitFlag;
     }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @Author Joburgess
  * @Date 2020/4/17
@@ -8,12 +10,45 @@ public class TeacherExercisesServiceDto {
 
     private Integer teacherId;
 
-    /** 预期训练次数 */
+    @ApiModelProperty(value = "预期训练次数")
     private Integer expectExercisesNum;
 
-    /** 实际训练次数 */
+    @ApiModelProperty(value = "实际训练次数")
     private Integer actualExercisesNum;
 
+    @ApiModelProperty(value = "作业布置率")
+    private String expectExercisesRate = "0%";
+
+    @ApiModelProperty(value = "作业提交率")
+    private String exercisesReplyRate = "0%";
+
+    @ApiModelProperty(value = "作业点评率")
+    private String exercisesMessageRate = "0%";
+
+    public String getExpectExercisesRate() {
+        return expectExercisesRate;
+    }
+
+    public void setExpectExercisesRate(String expectExercisesRate) {
+        this.expectExercisesRate = expectExercisesRate;
+    }
+
+    public String getExercisesReplyRate() {
+        return exercisesReplyRate;
+    }
+
+    public void setExercisesReplyRate(String exercisesReplyRate) {
+        this.exercisesReplyRate = exercisesReplyRate;
+    }
+
+    public String getExercisesMessageRate() {
+        return exercisesMessageRate;
+    }
+
+    public void setExercisesMessageRate(String exercisesMessageRate) {
+        this.exercisesMessageRate = exercisesMessageRate;
+    }
+
     public Integer getTeacherId() {
         return teacherId;
     }

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

@@ -62,6 +62,17 @@ public class WebCourseHomeworkListDto {
     @ApiModelProperty(value = "已回复数",required = false)
     private Integer repliedNum = 0;
 
+    @ApiModelProperty(value = "伴奏编号",required = false)
+    private String musicScoreId;
+
+    public String getMusicScoreId() {
+        return musicScoreId;
+    }
+
+    public void setMusicScoreId(String musicScoreId) {
+        this.musicScoreId = musicScoreId;
+    }
+
     public String getClassDate() {
         return classDate;
     }

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

@@ -49,6 +49,10 @@ public class StudentAttendance extends BaseEntity {
 	private Integer currentGradeNum;
 
 	/**  */
+	@ApiModelProperty(value = "班级",required = false)
+	private String currentClass;
+
+	/**  */
 	@ApiModelProperty(value = "学生姓名",required = false)
 	private String username;
 
@@ -100,6 +104,14 @@ public class StudentAttendance extends BaseEntity {
 	@ApiModelProperty(value = "是否达标1是0否")
 	private Integer qualifiedFlag;
 
+	public String getCurrentClass() {
+		return currentClass;
+	}
+
+	public void setCurrentClass(String currentClass) {
+		this.currentClass = currentClass;
+	}
+
 	public Integer getQualifiedFlag() {
 		return qualifiedFlag;
 	}

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

@@ -26,6 +26,17 @@ public class CourseHomeWorkTemplateQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "课程组类型")
     private String groupType = "MUSIC";
 
+    @ApiModelProperty(value = "是否云教练作业")
+    private Boolean cloudHomeworkFlag;
+
+    public Boolean getCloudHomeworkFlag() {
+        return cloudHomeworkFlag;
+    }
+
+    public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+        this.cloudHomeworkFlag = cloudHomeworkFlag;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -10,6 +11,10 @@ import java.util.Date;
  */
 public class ExtraExercilseQueryInfo extends QueryInfo {
 
+	private String startTime;
+
+	private String endTime;
+
 	private String batchNo;// 批次号
 
 	private Integer teacherId;
@@ -26,6 +31,33 @@ public class ExtraExercilseQueryInfo extends QueryInfo {
 
 	private Date assignEndTime;// 布置作业的结束时间
 
+	@ApiModelProperty(value = "是否云教练作业")
+	private Boolean cloudHomeworkFlag;
+
+	public Boolean getCloudHomeworkFlag() {
+		return cloudHomeworkFlag;
+	}
+
+	public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+		this.cloudHomeworkFlag = cloudHomeworkFlag;
+	}
+
+	public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
 	public Integer getTeacherId() {
 		return teacherId;
 	}

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

@@ -43,6 +43,17 @@ public class ExtraExercilseReplyQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "是否存在vip课")
 	private Integer existVipCourse;
 
+	@ApiModelProperty(value = "是否云教练作业")
+	private Boolean cloudHomeworkFlag;
+
+	public Boolean getCloudHomeworkFlag() {
+		return cloudHomeworkFlag;
+	}
+
+	public void setCloudHomeworkFlag(Boolean cloudHomeworkFlag) {
+		this.cloudHomeworkFlag = cloudHomeworkFlag;
+	}
+
 	public Integer getExistVipCourse() {
 		return existVipCourse;
 	}

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

@@ -42,6 +42,15 @@ public class StudentStatisticsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "是否查询课耗异常",required = false)
     private Boolean courseConsumerError;
 
+    @ApiModelProperty(value = "是否预警（未开始课时数+未排课课时数≤3为【是】）",required = false)
+    private Boolean wornFlag;
+
+    @ApiModelProperty(value = "剩余课时数(未开始课时数+未排课课时数 小于指定数量)",required = false)
+    private Integer subCourseMinNum;
+
+    @ApiModelProperty(value = "剩余课时数（未开始课时数+未排课课时数 大于指定数量）",required = false)
+    private Integer subCourseMaxNum;
+
     @ApiModelProperty(value = "第一次课开始时间（年月日）",required = false)
     private String firstCourseStartTime;
 
@@ -51,6 +60,30 @@ public class StudentStatisticsQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "分部编号列表",required = false)
     private String organId;
 
+    public Boolean getWornFlag() {
+        return wornFlag;
+    }
+
+    public void setWornFlag(Boolean wornFlag) {
+        this.wornFlag = wornFlag;
+    }
+
+    public Integer getSubCourseMinNum() {
+        return subCourseMinNum;
+    }
+
+    public void setSubCourseMinNum(Integer subCourseMinNum) {
+        this.subCourseMinNum = subCourseMinNum;
+    }
+
+    public Integer getSubCourseMaxNum() {
+        return subCourseMaxNum;
+    }
+
+    public void setSubCourseMaxNum(Integer subCourseMaxNum) {
+        this.subCourseMaxNum = subCourseMaxNum;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -10,6 +10,10 @@ import java.util.Date;
  */
 public class TeacherServeHomeworkQueryInfo extends QueryInfo {
 
+    private Date startTime;
+
+    private Date endTime;
+
     private Date monday;
 
     private Date sunday;
@@ -20,6 +24,22 @@ public class TeacherServeHomeworkQueryInfo extends QueryInfo {
 
     private String courseType;
 
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public Date getMonth() {
         return month;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -588,4 +588,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     List<ClassGroup> queryStudentClassGroupsAndTeacher(String musicGroupId);
 
     CourseScheduleStatistics getMusicGroupCourseScheduleStatistics(queryMusicGroupCourseScheduleQueryInfo queryInfo);
+
+    //修改班级基本信息
+    int updateClassGroup(ClassGroup classGroup);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/StudentExtracurricularExercisesSituationService.java

@@ -2,10 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.StudentExtracurricularExercisesSituation;
-import com.ym.mec.biz.dal.page.StudentExercisesSituationQueryInfo;
-import com.ym.mec.biz.dal.page.StudentServiceDetailQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherServeHomeworkQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherServeQueryInfo;
+import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -80,4 +77,6 @@ public interface StudentExtracurricularExercisesSituationService extends BaseSer
 
     //删除指定学员服务指标
     void deleteByStudent(Integer studentId,String monday);
+
+    TeacherExercisesServiceDto getStatistics(ExtraExercilseQueryInfo queryInfo);
 }

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

@@ -3412,6 +3412,26 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateClassGroup(ClassGroup classGroup) {
+        ClassGroup group = classGroupDao.get(classGroup.getId());
+        if(Objects.isNull(group)){
+            throw new BizException("班级信息不存在");
+        }
+        String groupName = classGroup.getName();
+        if(StringUtils.isEmpty(groupName)){
+            throw new BizException("请填写班级名称");
+        }
+        classGroupDao.update(classGroup);
+        ImGroup imGroup = imGroupService.get(classGroup.getId().longValue());
+        if(!Objects.isNull(imGroup)){
+            imGroup.setName(groupName);
+            imGroupService.update(imGroup);
+        }
+        return 1;
+    }
+
+    @Override
     public PageInfo<MusicGroupCourseScheduleDto> queryMusicGroupCourseScheduleDetail(queryMusicGroupCourseScheduleQueryInfo queryInfo) {
         PageInfo<MusicGroupCourseScheduleDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();

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

@@ -213,7 +213,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = extracurricularExercisesReplyDao.findExtraExercises(params);
-			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
+//			List<Long> replyIds = dataList.stream().map(ExtraExerciseStudentsDto::getId).collect(Collectors.toList());
 			List<Integer> teacherIds = dataList.stream().map(ExtraExerciseStudentsDto::getTeacherId).collect(Collectors.toList());
 			List<SimpleUserDto> teachers = teacherDao.findSimpleTeachers(teacherIds, queryInfo.getTenantId());
 			Map<Integer, String> idNameMap = teachers.stream().collect(Collectors.toMap(SimpleUserDto::getUserId, SimpleUserDto::getUserName));

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

@@ -166,6 +166,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 Student student = new Student();
                 student.setUserId(studentAttendance.getUserId());
                 student.setCurrentGradeNum(studentAttendance.getCurrentGradeNum());
+                student.setCurrentClass(studentAttendance.getCurrentClass());
                 student.setTenantId(studentAttendance.getTenantId());
                 students.add(student);
             }

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

@@ -9,12 +9,10 @@ import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.TeacherRemindTypeEnum;
-import com.ym.mec.biz.dal.page.StudentExercisesSituationQueryInfo;
-import com.ym.mec.biz.dal.page.StudentServiceDetailQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherServeHomeworkQueryInfo;
-import com.ym.mec.biz.dal.page.TeacherServeQueryInfo;
+import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -30,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -412,13 +411,20 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 
 	@Override
 	public PageInfo<TeacherServeHomeworkPojo> queryTeacherServeHomeworkDetail1(TeacherServeHomeworkQueryInfo queryInfo) {
-		if(Objects.isNull(queryInfo.getMonth())){
-			throw new BizException("请指定课程时间");
-		}
+//		if(Objects.isNull(queryInfo.getMonth())){
+//			throw new BizException("请指定课程时间");
+//		}
 		PageInfo<TeacherServeHomeworkPojo> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		//获取时间段内有服务指标的课程(课后作业)
-		Date firstDayOfMonth = DateUtil.getFirstDayOfMonth(queryInfo.getMonth());
-		Date lastDayOfMonth = DateUtil.getLastDayOfMonth(queryInfo.getMonth());
+		Date firstDayOfMonth;
+		Date lastDayOfMonth;
+		if(Objects.isNull(queryInfo.getStartTime())){
+			firstDayOfMonth = DateUtil.getFirstDayOfMonth(queryInfo.getMonth());
+			lastDayOfMonth = DateUtil.getLastDayOfMonth(queryInfo.getMonth());
+		}else {
+			firstDayOfMonth = queryInfo.getStartTime();
+			lastDayOfMonth = queryInfo.getEndTime();
+		}
 		List<Long> courseIds = studentExtracurricularExercisesSituationDao.queryCourseIdByClassDate(firstDayOfMonth,lastDayOfMonth,queryInfo.getTeacherId());
 		if(courseIds == null || courseIds.size() == 0){
 			return pageInfo;
@@ -596,7 +602,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 			return;
 		}
 		studentExtracurricularExercisesSituationDao.batchInsert(situations);
-		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).distinct().collect(Collectors.joining(","));
 		if(StringUtils.isNotEmpty(collect)){
 			//更新课程服务指标
 			courseScheduleStatisticsDao.updateCourseService(collect,1);
@@ -617,6 +623,42 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		studentExtracurricularExercisesSituationDao.deleteByStudent(studentId,monday);
 	}
 
+	@Override
+	public TeacherExercisesServiceDto getStatistics(ExtraExercilseQueryInfo queryInfo) {
+		TeacherExercisesServiceDto serviceDto = new TeacherExercisesServiceDto();
+		List<Integer> teacherIds = new ArrayList();
+		teacherIds.add(queryInfo.getTeacherId());
+		List<StudentExtracurricularExercisesSituation> teacherServeWithDate =
+				studentExtracurricularExercisesSituationDao.findTeacherServeWithDate(queryInfo.getStartTime(), queryInfo.getEndTime(), teacherIds, null);
+		if(!CollectionUtils.isEmpty(teacherServeWithDate)){
+			//预计训练次数
+			double expectExercisesNum = teacherServeWithDate.stream().mapToDouble(e -> e.getExpectExercisesNum()).sum();
+			//实际训练次数
+			double actualExercisesNum = teacherServeWithDate.stream().mapToInt(e -> e.getActualExercisesNum()).sum();
+			//布置率
+			BigDecimal oneHundred = new BigDecimal(100);
+			if(expectExercisesNum > 0d){
+				BigDecimal submitRate = new BigDecimal(actualExercisesNum).divide(new BigDecimal(expectExercisesNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred).setScale(0);
+				serviceDto.setExpectExercisesRate(submitRate + "%");
+			}
+			//训练提交次数
+			double exercisesReplyNum = teacherServeWithDate.stream().mapToInt(e -> e.getExercisesReplyNum()).sum();
+			//提交率
+			if(actualExercisesNum > 0d){
+				BigDecimal submitRate = new BigDecimal(exercisesReplyNum).divide(new BigDecimal(actualExercisesNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred).setScale(0);
+				serviceDto.setExercisesReplyRate(submitRate + "%");
+			}
+			//点评次数
+			double exercisesMessageNum = teacherServeWithDate.stream().mapToInt(e -> e.getExercisesMessageNum()).sum();
+			//点评率
+			if(exercisesReplyNum > 0d){
+				BigDecimal submitRate = new BigDecimal(exercisesMessageNum).divide(new BigDecimal(exercisesReplyNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(oneHundred).setScale(0);
+				serviceDto.setExercisesMessageRate(submitRate + "%");
+			}
+		}
+		return serviceDto;
+	}
+
 	@Transactional(rollbackFor = Exception.class)
 	public void delSituations(List<StudentExtracurricularExercisesSituation> situations){
 		if (CollectionUtils.isEmpty(situations)){
@@ -624,7 +666,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		}
 //		List<Long> collect1 = situations.stream().map(e -> e.getId()).collect(Collectors.toList());
 //		studentExtracurricularExercisesSituationDao.batchDelete(collect1);
-		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+		String collect = situations.stream().map(e -> e.getCourseIds()).filter(e -> StringUtils.isNotEmpty(e)).distinct().collect(Collectors.joining(","));
 		if(StringUtils.isNotEmpty(collect)){
 			//更新课程服务指标
 			courseScheduleStatisticsDao.updateCourseService(collect,0);

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

@@ -348,9 +348,6 @@
             <if test="userId != null">
                 AND cgsm.user_id_ = #{userId}
             </if>
-            <if test="tenantId != null">
-                AND cgsm.tenant_id_ = #{tenantId}
-            </if>
             <if test="search != null and search != ''">
                 AND (cg.name_ LIKE CONCAT('%',#{search},'%') OR cg.group_name_ LIKE CONCAT('%',#{search},'%') OR mg.name_ LIKE CONCAT('%',#{search},'%'))
             </if>

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

@@ -203,6 +203,7 @@
             su.avatar_,
             cssp.be_merged_,
             st.current_grade_num_,
+            st.current_class_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp

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

@@ -285,13 +285,15 @@
 		<result property="classDate" column="class_date_"/>
 		<result property="classStartDate" column="start_class_time_"/>
 		<result property="classEndDate" column="end_class_time_"/>
+		<result property="musicScoreId" column="music_score_id_"/>
 	</resultMap>
     <select id="queryHomePage" resultMap="WebCourseHomeworkListDtoMap">
 		SELECT ch.id_,cs.id_ course_schedule_id_,cs.name_ course_schedule_name_,
 		cs.class_date_,cs.start_class_time_,cs.end_class_time_,cs.organ_id_,o.name_ organ_name_,
 		mg.id_ group_id_,mg.name_ group_name_,ch.create_time_,cs.actual_teacher_id_,
-		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_
+		su.real_name_ actual_teacher_name_,ch.completed_num_,ch.expect_num_,cs.group_type_,sch.music_score_id_
 		FROM course_homework ch
+		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_
 		<if test="groupType == 'MUSIC'">
@@ -305,6 +307,7 @@
 		</if>
 		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
 		<include refid="queryHomePageSql"/>
+		GROUP BY ch.id_
 		ORDER BY ch.create_time_ DESC,ch.id_ DESC
 		<include refid="global.limit"/>
 	</select>
@@ -320,6 +323,12 @@
 			<if test="classEndDate != null and classEndDate != ''">
 				AND cs.class_date_ &lt;= #{classEndDate}
 			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND sch.music_score_id_ IS NOT NULL AND sch.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (sch.music_score_id_ IS NULL OR sch.music_score_id_ = '')
+			</if>
 			<if test="search != null and search != ''">
 				AND (cs.id_ = #{search} OR cs.name_ LIKE CONCAT('%',#{search},'%')
 				OR mg.name_ LIKE CONCAT('%',#{search},'%')
@@ -328,8 +337,9 @@
 		</where>
 	</sql>
 	<select id="findHomeCount" resultType="java.lang.Integer">
-		SELECT COUNT(ch.id_)
+		SELECT COUNT(DISTINCT ch.id_)
 		FROM course_homework ch
+		LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
 		LEFT JOIN course_schedule cs ON cs.id_ = ch.course_schedule_id_
 		LEFT JOIN sys_user su ON su.id_ = cs.actual_teacher_id_
 		LEFT JOIN organization o ON o.id_ = cs.organ_id_

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

@@ -22,6 +22,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="organ_name_" property="organName" />
 		<result column="tenant_id_" property="tenantId" />
+		<result column="music_score_id_" property="musicScoreId" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -45,6 +46,12 @@
 			<if test="assignEndTime != null">
 				AND date(ee.create_time_) &lt;= #{assignEndTime}
 			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND eer.music_score_id_ IS NOT NULL AND eer.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (eer.music_score_id_ IS NULL OR eer.music_score_id_ = '')
+			</if>
 		</where>
 	</sql>
 	
@@ -108,19 +115,24 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT ee.*,u.real_name_ username_,o.name_ organ_name_
-		FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
-		left join teacher t on t.id_ = ee.teacher_id_
-		left join organization o on o.id_ = t.organ_id_
+		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.batch_no_,ee.title_,ee.attachments_,
+		       ee.content_,ee.expire_date_,ee.completed_num_,ee.expect_num_,ee.create_time_,ee.update_time_,ee.tenant_id_
+		     ,u.real_name_ username_,o.name_ organ_name_,eer.music_score_id_
+		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_
+		LEFT JOIN teacher t ON t.id_ = ee.teacher_id_
+		LEFT JOIN organization o ON o.id_ = t.organ_id_
+		LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
 		<include refid="queryPageCondition"/>
+		GROUP BY ee.id_
 		ORDER BY id_ <include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
+		SELECT COUNT(DISTINCT ee.id_) FROM extracurricular_exercises ee left join sys_user u on ee.teacher_id_ = u.id_
 		left join teacher t on t.id_ = ee.teacher_id_
 		left join organization o on o.id_ = t.organ_id_
+		LEFT JOIN extracurricular_exercises_reply eer ON ee.id_ = eer.extracurricular_exercises_id_
 		<include refid="queryPageCondition"/>
 	</select>
 
@@ -225,6 +237,9 @@
 			<if test="createTime!=null">
 				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
+			<if test="startTime != null and startTime != ''">
+				AND DATE_FORMAT(#{createTime}, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+			</if>
 		</where>
 		UNION ALL
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch
@@ -255,6 +270,9 @@
 			<if test="createTime!=null">
 				AND DATE_FORMAT(create_time_, '%Y-%m') = DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
+			<if test="startTime != null and startTime != ''">
+				AND DATE_FORMAT(#{createTime}, '%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
+			</if>
 		</where>
 		UNION ALL
 		SELECT ch.id_,ch.create_time_,'HOMEWORK' type_ FROM course_homework ch

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

@@ -267,6 +267,12 @@
 	<sql id="queryExtraExercisesCondition">
 		<where>
 			eer.tenant_id_ = #{tenantId}
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == true">
+				AND eer.music_score_id_ IS NOT NULL AND eer.music_score_id_ != ''
+			</if>
+			<if test="cloudHomeworkFlag != null and cloudHomeworkFlag == false">
+				AND (eer.music_score_id_ IS NULL OR eer.music_score_id_ = '')
+			</if>
 			<if test="extracurricularExercisesId != null">
 				AND extracurricular_exercises_id_ = #{extracurricularExercisesId}
 			</if>
@@ -529,7 +535,8 @@
 			ee.create_time_ createTime,
 			COUNT( eer.user_id_ ) exceptStudentNum,
 			SUM( eer.status_ ) submitStudentNum,
-			SUM( eer.is_replied_ ) repliedStudentNum
+			SUM( eer.is_replied_ ) repliedStudentNum,
+			eer.music_score_id_ musicScoreId
 		FROM
 			extracurricular_exercises ee
 			LEFT JOIN sys_user su ON ee.teacher_id_ = su.id_

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

@@ -187,6 +187,7 @@
         <result property="subjectId" column="subject_id_"/>
         <result property="subjectName" column="subject_name_"/>
         <result property="currentGradeNum" column="current_grade_num_"/>
+        <result property="currentClass" column="current_class_"/>
         <result property="avatar" column="avatar_"/>
         <result property="phone" column="phone_"/>
         <result property="beMerged" column="be_merged_"/>

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

@@ -540,7 +540,8 @@
             su.avatar_ teacherAvatar,
             COUNT( sch.user_id_ ) exceptStudentNum,
             SUM( sch.status_ ) submitStudentNum,
-            SUM( sch.is_replied_ ) repliedStudentNum
+            SUM( sch.is_replied_ ) repliedStudentNum,
+            sch.music_score_id_ musicScoreId
         FROM
             course_homework ch
             LEFT JOIN music_group mg ON mg.id_ = ch.music_group_id_

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

@@ -254,6 +254,9 @@
                 <if test="item.currentGradeNum != null">
                     current_grade_num_=#{item.currentGradeNum},
                 </if>
+                <if test="item.currentClass != null and item.currentClass != ''">
+                    current_class_ = #{item.currentClass},
+                </if>
                 <if test="item.serviceTag != null">
                     service_tag_ = #{item.serviceTag},
                 </if>

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

@@ -284,12 +284,24 @@
 			<if test="courseConsumerError != null and courseConsumerError == false">
 				AND ss.lately_course_consumer_ >= 4
 			</if>
+			<if test="wornFlag != null and wornFlag == true">
+				AND (ss.no_schedule_num_ + ss.sub_course_num_) &lt; 4
+			</if>
+			<if test="wornFlag != null and wornFlag == false">
+				AND (ss.no_schedule_num_ + ss.sub_course_num_) > 3
+			</if>
 			<if test="firstCourseStartTime != null">
 				AND ss.first_course_time_ >= #{firstCourseStartTime}
 			</if>
 			<if test="firstCourseEndTime != null">
 				AND ss.first_course_time_ &lt;= #{firstCourseEndTime}
 			</if>
+			<if test="subCourseMinNum != null">
+				AND (ss.no_schedule_num_ + ss.sub_course_num_) >= #{subCourseMinNum}
+			</if>
+			<if test="subCourseMaxNum != null">
+				AND (ss.no_schedule_num_ + ss.sub_course_num_) &lt;= #{subCourseMaxNum}
+			</if>
 			<if test="groupType != null and groupType != ''">
 				AND ss.group_type_ = #{groupType}
 			</if>

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

@@ -45,7 +45,9 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_
+		SELECT sesa.id_,sesa.exam_song_id_,sesa.subject_id_,CASE WHEN sesa.metronome_mp3_url_ IS NULL OR sesa.metronome_mp3_url_ = '' THEN sesa.mp3_url_ ELSE sesa.metronome_mp3_url_ END url_,sesa.speed_,
+		sesa.xml_url_,sesa.is_show_fingering_,sesa.is_open_metronome_,sesa.memo_,sesa.track_,
+		ses.name_,ses.type_,ses.url_ mp3_url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -493,7 +493,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         String leaveSuccessKey = "leaveRoomSuccess" + roomId + userId;
-        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 10l, TimeUnit.SECONDS);
+        Boolean aBoolean = redisTemplate.opsForValue().setIfAbsent(leaveSuccessKey, roomId, 1l, TimeUnit.SECONDS);
         log.info("leaveRoomSuccess: roomId={}, userId={},deviceNum={},aBoolean={}", roomId, userId, deviceNum, aBoolean);
         if (!aBoolean) {
             if (StringUtils.isNotEmpty(deviceNum)) {

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ExtracurricularExercisesController.java

@@ -12,6 +12,7 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.dal.page.TeacherServeHomeworkQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherServeQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
@@ -63,6 +64,18 @@ public class ExtracurricularExercisesController extends BaseController {
         return succeed(studentExtracurricularExercisesSituationService.queryTeacherServeHomeworkDetail1(queryInfo));
     }
 
+
+    @ApiOperation(value = "获取老师训练统计")
+    @GetMapping("/getStatistics")
+    public HttpResponseResult getStatistics(ExtraExercilseQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        queryInfo.setTeacherId(sysUser.getId());
+        return succeed(studentExtracurricularExercisesSituationService.getStatistics(queryInfo));
+    }
+
     @ApiOperation(value = "统计老师当前时间能布置作业的课程数量")
     @GetMapping("/countWaitCreateHomeworkNum")
     public HttpResponseResult countWaitCreateHomeworkNum() {

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

@@ -4,9 +4,11 @@ import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.CourseScheduleStatistics;
+import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderStudentDetail;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
-import com.ym.mec.biz.dal.enums.ExportTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
 import com.ym.mec.biz.dal.page.ClassGroupQueryInfo;
@@ -17,7 +19,6 @@ import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.*;
@@ -30,9 +31,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 @RequestMapping("classGroup")
@@ -64,6 +62,14 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupService.create(classGroup));
     }
 
+    @ApiOperation(value = "班级基本信息修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
+    public HttpResponseResult update(ClassGroup classGroup) throws Exception {
+        classGroup.setUpdateTime(new Date());
+        return succeed(classGroupService.updateClassGroup(classGroup));
+    }
+
     @ApiOperation(value = "新增单技班班级")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('classGroup/add')")
@@ -107,15 +113,6 @@ public class ClassGroupController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation(value = "修改班级")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('classGroup/update')")
-    public Object update(ClassGroup classGroup) {
-        classGroup.setUpdateTime(new Date());
-        classGroupService.update(classGroup);
-        return succeed();
-    }
-
     @ApiOperation(value = "合奏班相关班级获取")
     @GetMapping("/findClassGroupAboutMix")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findClassGroupAboutMix')")

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

@@ -1529,13 +1529,14 @@ public class ExportController extends BaseController {
             row.setIsRepliedStr(Objects.isNull(row.getIsReplied()) || row.getIsReplied() == 0 ? "否" : "是");
             row.setIsRepliedTimelyStr(Objects.isNull(row.getIsRepliedTimely()) || row.getIsRepliedTimely() == 0 ? "否" : "是");
             row.setExistVipCourseStr(Objects.isNull(row.getExistVipCourse()) || row.getExistVipCourse() == 0 ? "否" : "是");
+            row.setMusicScoreId(StringUtils.isEmpty(row.getMusicScoreId()) ? "否" : "是");
         }
         OutputStream ouputStream = null;
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(
-                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生姓名", "学生编号", "提交训练", "提交训练时间", "是否评价", "是否有vip", "及时评价"},
+                    new String[]{"布置时间", "截至时间", "训练标题", "老师名字", "分部", "学生姓名", "学生编号", "提交训练", "提交训练时间", "是否评价", "是否有vip", "及时评价", "是否团练宝布置"},
                     new String[]{"createTime", "expireDate", "title", "teacherName", "organName",
-                            "user.username", "userId", "statusStr", "submitTime", "isRepliedStr", "existVipCourseStr", "isRepliedTimelyStr"}, rows);
+                            "user.username", "userId", "statusStr", "submitTime", "isRepliedStr", "existVipCourseStr", "isRepliedTimelyStr", "musicScoreId"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             ouputStream = response.getOutputStream();

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

@@ -1,16 +1,11 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.ExtraExercilseQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.ExtracurricularExercisesService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "课外训练服务")
@@ -32,8 +25,6 @@ public class ExtracurricularExercisesController extends BaseController {
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private OrganizationService organizationService;
 
     @ApiOperation(value = "获取课外训练列表")

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

@@ -1,13 +1,10 @@
 package com.ym.mec.web.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.page.ExtraExercilseReplyQueryInfo;
 import com.ym.mec.biz.service.ExtracurricularExercisesReplyService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -24,8 +21,6 @@ public class ExtracurricularExercisesReplyController extends BaseController {
     @Autowired
     private ExtracurricularExercisesReplyService extracurricularExercisesReplyService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
-    @Autowired
     private OrganizationService organizationService;
 
     @ApiOperation(value = "获取课外训练作业列表")