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

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

@@ -23,4 +23,12 @@ public interface CourseScheduleStatisticsDao extends BaseDAO<Long, CourseSchedul
 
     //更新服务指标
     void updateCourseService(@Param("courseIds") String courseIds, @Param("serviceFlag") int serviceFlag);
+
+    void updateNum(@Param("courseScheduleId") Long courseScheduleId,
+                   @Param("teacherId") Integer teacherId,
+                   @Param("studentIds") List<Integer> studentIds);
+
+    void updateLastSubmitTime(@Param("courseScheduleId") Long courseScheduleId,
+                              @Param("teacherId") Integer teacherId,
+                              @Param("userId") Integer userId);
 }

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

@@ -254,6 +254,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty("作业来源分类")
         private String groupType;
 
+
+        private String type;
+
         /** 批次号 */
         @ApiModelProperty(value="批次号")
         private String batchNo;

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

@@ -4,6 +4,7 @@ package com.ym.mec.biz.dal.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,6 +30,9 @@ public class StudentLessonExaminationDto1 {
     @ApiModelProperty(value = "声部")
     private String subjectName;
 
+    @ApiModelProperty(value = "训练时间")
+    private Date trainingTime;
+
     private List<StudentLessonExaminationDetailDto1> detailDtos;
 }
 

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

@@ -22,22 +22,11 @@ public class TeacherSignOutDto {
     @ApiModelProperty(value = "学员学习是否达标")
     private List<StudentStandardDto> studentStandardDtos;
 
-    @ApiModelProperty(value = "课后评测信息")
-    private LessonExaminationSaveDto lessonExaminationSaveDto;
-
     /**
      * 是否返回错误信息
      */
     private boolean notRturnErrorInfo;
 
-    public LessonExaminationSaveDto getLessonExaminationSaveDto() {
-        return lessonExaminationSaveDto;
-    }
-
-    public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
-        this.lessonExaminationSaveDto = lessonExaminationSaveDto;
-    }
-
     public List<StudentStandardDto> getStudentStandardDtos() {
         return studentStandardDtos;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.dto.LessonExaminationSaveDto;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
@@ -70,7 +71,18 @@ public class CourseHomework extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
-    public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
+	@ApiModelProperty(value = "课后评测信息")
+	private LessonExaminationSaveDto lessonExaminationSaveDto;
+
+	public LessonExaminationSaveDto getLessonExaminationSaveDto() {
+		return lessonExaminationSaveDto;
+	}
+
+	public void setLessonExaminationSaveDto(LessonExaminationSaveDto lessonExaminationSaveDto) {
+		this.lessonExaminationSaveDto = lessonExaminationSaveDto;
+	}
+
+	public List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> getStudentLessonTrainingDetails() {
         return studentLessonTrainingDetails;
     }
 

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

@@ -3,12 +3,14 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.MusicScoreSubjectDto;
 import com.ym.mec.biz.dal.dto.StudentLessonTrainingDetailWrapper;
+import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
 import com.ym.mec.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -94,6 +96,8 @@ public class ExtracurricularExercises extends BaseEntity {
 
 	private List<MusicScoreSubjectDto> musicScoreSubjectDtos;
 
+    @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
+    private String type;
 
     @ApiModelProperty("乐团名")
     private String musicGroupName;
@@ -108,6 +112,14 @@ public class ExtracurricularExercises extends BaseEntity {
     @ApiModelProperty("新版作业 time:2023-03-31")
     private List<StudentLessonTrainingDetailWrapper.AddStudentLessonTrainingDetail> studentLessonTrainingDetails;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getVersionTag() {
         return versionTag;
     }

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

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.entity.LessonExamination;
 import com.ym.mec.biz.dal.entity.StudentExtracurricularExercisesSituation;
+import com.ym.mec.biz.dal.entity.StudentLessonExamination;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -83,4 +85,24 @@ public interface StudentExtracurricularExercisesSituationService extends BaseSer
      *
      */
     PageInfo<CourseHomeworkWrapper.CourseHomeworkList> queryTeacherExtraHomeworkDetailV2(CourseHomeworkWrapper.CourseHomeworkQuery queryInfo);
+
+    /**
+    * @description: 老师布置测验后更新服务指标相关数据
+     * @param lessonExamination
+     * @param studentIds
+    * @return void
+    * @author zx
+    * @date 2023/4/10 16:18
+    */
+    void updateNum(LessonExamination lessonExamination, List<Integer> studentIds);
+
+    /**
+    * @description: 学员提交作业后更新服务指标
+     * @param lessonExamination
+     * @param studentLessonExamination
+    * @return void
+    * @author zx
+    * @date 2023/4/10 16:38
+    */
+    void updateLastSubmitTime(LessonExamination lessonExamination, StudentLessonExamination studentLessonExamination);
 }

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

@@ -19,7 +19,7 @@ public interface StudentLessonExaminationService extends IService<StudentLessonE
 
     StudentLessonExaminationDao getDao();
 
-    void save(Long lessonExaminationId,List<StudentLessonExaminationSaveDto> studentLessonExaminationSaveDtos);
+    List<Integer> save(Long lessonExaminationId,List<StudentLessonExaminationSaveDto> studentLessonExaminationSaveDtos);
 
     PageInfo<StudentLessonExaminationDto> queryPage(StudentLessonExaminationQueryInfo queryInfo);
 

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

@@ -369,6 +369,7 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
             }
 
             // 设置提交时间
+            studentHomeworkRecordDto.setCourseScheduleId(studentHomeworkRecordDto.getStudentCourseHomeworkId().longValue());
 
         }
 

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

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo;
 import com.ym.mec.biz.dal.page.LessonExaminationQueryInfo1;
 import com.ym.mec.biz.service.LessonExaminationService;
+import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.biz.service.StudentLessonExaminationDetailService;
 import com.ym.mec.biz.service.StudentLessonExaminationService;
 import com.ym.mec.common.exception.BizException;
@@ -44,6 +45,8 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
     @Autowired
     private StudentLessonExaminationDetailService studentLessonExaminationDetailService;
     @Autowired
+    private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
+    @Autowired
     private MusicGroupDao musicGroupDao;
     @Autowired
     private TeacherDao teacherDao;
@@ -100,8 +103,10 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
         lessonExamination.setExpireDate(expireDate);
         lessonExamination.setTeacherId(param.getTeacherId());
         baseMapper.insert(lessonExamination);
-        studentLessonExaminationService.save(lessonExamination.getId(),param.getStudentLessonExaminationSaveDtos());
+        List<Integer> studentIds = studentLessonExaminationService.save(lessonExamination.getId(), param.getStudentLessonExaminationSaveDtos());
         studentLessonExaminationDetailService.save(lessonExamination.getId(),param.getStudentLessonExaminationSaveDtos());
+        //更新服务指标相关数量信息
+        studentExtracurricularExercisesSituationService.updateNum(lessonExamination,studentIds);
     }
 
     @Override

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

@@ -834,9 +834,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                         String userId = split[0];
                         SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
                         if (split.length == 1) {
-                            courseHomeworkList.setMusicGroupName(sysUser.getUsername());
+                            courseHomeworkList.setClassGroupName(sysUser.getUsername());
                         } else {
-                            courseHomeworkList.setMusicGroupName(sysUser.getUsername() + "等" + split.length + "名学员");
+                            courseHomeworkList.setClassGroupName(sysUser.getUsername() + "等" + split.length + "名学员");
                         }
                     }
                 }
@@ -858,7 +858,20 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
         return pageInfo;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public void updateNum(LessonExamination lessonExamination, List<Integer> studentIds) {
+		courseScheduleStatisticsDao.updateNum(lessonExamination.getCourseScheduleId(),lessonExamination.getTeacherId(),studentIds);
+    }
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateLastSubmitTime(LessonExamination lessonExamination, StudentLessonExamination studentLessonExamination) {
+		courseScheduleStatisticsDao.updateLastSubmitTime(lessonExamination.getCourseScheduleId(),lessonExamination.getTeacherId(),
+				studentLessonExamination.getUserId());
+	}
+
+	@Transactional(rollbackFor = Exception.class)
 	public void delSituations(List<StudentExtracurricularExercisesSituation> situations){
 		if (CollectionUtils.isEmpty(situations)){
 			return;

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.LessonExaminationDao;
+import com.ym.mec.biz.dal.dao.StudentExtracurricularExercisesSituationDao;
 import com.ym.mec.biz.dal.dao.StudentLessonExaminationDao;
 import com.ym.mec.biz.dal.dao.StudentLessonExaminationDetailDao;
 import com.ym.mec.biz.dal.dto.LessonExaminationSubmitDto;
@@ -13,6 +14,7 @@ import com.ym.mec.biz.dal.entity.StudentLessonExamination;
 import com.ym.mec.biz.dal.entity.StudentLessonExaminationDetail;
 import com.ym.mec.biz.dal.page.StudentLessonExaminationQueryInfo;
 import com.ym.mec.biz.service.LessonExaminationService;
+import com.ym.mec.biz.service.StudentExtracurricularExercisesSituationService;
 import com.ym.mec.biz.service.StudentLessonExaminationDetailService;
 import com.ym.mec.biz.service.StudentLessonExaminationService;
 import com.ym.mec.common.exception.BizException;
@@ -42,6 +44,8 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
     private StudentLessonExaminationDetailService studentLessonExaminationDetailService;
     @Autowired
     private LessonExaminationDao lessonExaminationDao;
+    @Autowired
+    private StudentExtracurricularExercisesSituationService studentExtracurricularExercisesSituationService;
 
     @Override
     public StudentLessonExaminationDao getDao() {
@@ -50,20 +54,24 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(Long lessonExaminationId, List<StudentLessonExaminationSaveDto> studentLessonExaminationSaveDtos) {
+    public List<Integer> save(Long lessonExaminationId, List<StudentLessonExaminationSaveDto> studentLessonExaminationSaveDtos) {
         List<StudentLessonExamination> studentLessonExaminations = new ArrayList<>();
+        List<Integer> studentIdList = Collections.EMPTY_LIST;
         for (StudentLessonExaminationSaveDto dto : studentLessonExaminationSaveDtos) {
             String[] studentIds = dto.getStudentIds().split(",");
             for (String studentId : studentIds) {
                 StudentLessonExamination studentLessonExamination = new StudentLessonExamination();
                 studentLessonExamination.setLessonExaminationId(lessonExaminationId);
-                studentLessonExamination.setUserId(Integer.parseInt(studentId));
+                int parseInt = Integer.parseInt(studentId);
+                studentIdList.add(parseInt);
+                studentLessonExamination.setUserId(parseInt);
                 studentLessonExamination.setSubjectId(dto.getSubjectId());
                 studentLessonExaminations.add(studentLessonExamination);
             }
         }
 
         baseMapper.insertBatch(studentLessonExaminations);
+        return studentIdList;
     }
 
     @Override
@@ -134,6 +142,8 @@ public class StudentLessonExaminationServiceImpl extends ServiceImpl<StudentLess
         if(flag){
             baseMapper.updateTrainingScore(lessonExaminationId,userId);
         }
+        //更新服务指标
+        studentExtracurricularExercisesSituationService.updateLastSubmitTime(lessonExamination,studentLessonExamination);
     }
 
     @Override

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

@@ -344,7 +344,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
 
-			if(StringUtils.isNotBlank(courseHomeworkInfo.getContent()) || !CollectionUtils.isEmpty(courseHomeworkInfo.getStudentLessonTrainingDetails())){
+            if(!CollectionUtils.isEmpty(courseHomeworkInfo.getMusicScoreSubjectDto())){
 				CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(teacherAttendance.getCourseScheduleId());
 				if(Objects.isNull(courseHomework)){
 					//新增课堂作业
@@ -452,7 +452,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 
 			//布置课后评测
-			LessonExaminationSaveDto examinationSaveDto = teacherSignOutDto.getLessonExaminationSaveDto();
+			LessonExaminationSaveDto examinationSaveDto = teacherSignOutDto.getCourseHomeworkInfo().getLessonExaminationSaveDto();
 			if(Objects.nonNull(examinationSaveDto)){
 				lessonExaminationService.publish(examinationSaveDto);
 			}

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

@@ -4180,7 +4180,7 @@
                 and cs.id_ = #{param.courseScheduleId}
             </if>
             <if test="param.versionTag !=null">
-                and ch.version_tag_ = #{param.versionTag}
+                and (ch.version_tag_ = #{param.versionTag} or ch.version_tag_ is null)
             </if>
 
             <if test="param.teacherId != null">
@@ -4229,7 +4229,7 @@
                 and cs.id_ = #{param.courseScheduleId}
             </if>
             <if test="param.versionTag !=null">
-                and ch.version_tag_ = #{param.versionTag}
+                and (ch.version_tag_ = #{param.versionTag} or ch.version_tag_ is null)
             </if>
         </where>
     </select>

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

@@ -121,6 +121,28 @@
 	<update id="updateCourseService">
 		UPDATE course_schedule_statistics SET service_flag_ = #{serviceFlag} WHERE FIND_IN_SET(course_schedule_id_,#{courseIds})
 	</update>
+    <update id="updateNum">
+		update student_extracurricular_exercises_situation_
+		set actual_exercises_num_ = 1,update_time_ = NOW()
+		where teacher_id_ = #{teacherId}
+		and student_id_ IN
+		<foreach collection="studentIds" open="(" close=")" item="userId" separator=",">
+			#{userId}
+		</foreach>
+		<if test="courseScheduleId != null">
+			AND FIND_IN_SET(#{courseScheduleId},course_ids_)
+		</if>
+		AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN monday_ AND sunday_ AND actual_exercises_num_ = 0
+	</update>
+	<update id="updateLastSubmitTime">
+		update student_extracurricular_exercises_situation_
+		set exercises_reply_num_ = 1,last_submit_time_ = NOW(),update_time_ = NOW()
+		where teacher_id_ = #{teacherId} and student_id_ = #{userId}
+		<if test="courseScheduleId != null">
+			AND FIND_IN_SET(#{courseScheduleId},course_ids_)
+		</if>
+		AND DATE_FORMAT(NOW(),'%Y-%m-%d') BETWEEN monday_ AND sunday_
+	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >

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

@@ -28,6 +28,7 @@
 		<result column="assignTime" property="assignTime" />
 		<result column="musicGroupName" property="musicGroupName" />
 		<result column="versionTag" property="versionTag" />
+		<result column="type" property="type" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -149,7 +150,7 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtracurricularExercises" parameterType="map">
-		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
+		SELECT ee.id_,ee.teacher_id_,ee.student_id_list_,ee.group_type_ as type,ee.batch_no_,ee.title_,ee.attachments_,ee.music_group_id_,
 		       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_,ee.create_time_ as assignTime,mg.name_ as musicGroupName,ee.class_group_id_ as classGroupId,ee.version_tag_ as versionTag
 		FROM extracurricular_exercises ee LEFT JOIN sys_user u ON ee.teacher_id_ = u.id_

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

@@ -73,6 +73,7 @@
         <result property="phone" column="phone_"/>
         <result property="username" column="username_"/>
         <result property="trainingScore" column="training_score_"/>
+        <result property="trainingTime" column="training_time_"/>
         <collection property="detailDtos" ofType="com.ym.mec.biz.dal.dto.StudentLessonExaminationDetailDto1">
             <result property="standardScore" column="standard_score_"/>
             <result property="trainingScore" column="training_score_"/>
@@ -84,7 +85,8 @@
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
         select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_,
-               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,sled.avg_score_,sled.heard_level_
+               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,
+               sled.avg_score_,sled.heard_level_,sle.training_time_
         from student_lesson_examination sle
         left join student_lesson_examination_detail sled ON sled.lesson_examination_id_ = sle.lesson_examination_id_ AND sled.user_id_ = sle.user_id_
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_