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

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

@@ -216,4 +216,6 @@ public interface StudentCourseHomeworkDao extends BaseDAO<Long, StudentCourseHom
 
     StudentCourseHomework getHomeworkByUserIdAndCourseHomeworkId(@Param("userId") Long userId, @Param(
         "courseHomeworkId") Long courseHomeworkId);
+
+    int queryNotSuccessExtraHomeworkList2(@Param("userId") Integer userId);
 }

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

@@ -141,6 +141,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
         private ELessonTrainingType type;
 
+        @ApiModelProperty("是否可布置")
+        private Boolean assignFlag;
+
         private String studentIdList;
 
         @ApiModelProperty("练习内容")

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

@@ -1802,16 +1802,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     .collect(Collectors.toList());
 
             if (!CollectionUtils.isEmpty(tempIds) && schedule.getGroupType() == MUSIC) {
-                List<Map<Integer, String>> studentSubjectNameMaps = subjectDao.findStudentSubjectNameMaps(tempIds);
-                Map<Integer, String> studentSubjectNameMap = MapUtil.convertIntegerMap(studentSubjectNameMaps);
-                List<Map<Integer, Long>> studentSubjectIdMaps = subjectDao.findStudentSubjectIdMaps(tempIds);
-                Map<Integer, Long> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     if (Objects.nonNull(studentAttendanceViewDto.getBeMerged()) && studentAttendanceViewDto.getBeMerged()) {
                         studentAttendanceViewDto.setSubjectName("被合并学员");
-                    } else {
-                        studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                        studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()));
                     }
                 });
             } else if (schedule.getGroupType() != MUSIC) {

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

@@ -177,7 +177,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
             Integer studentId = extracurricularExercisesReply.getUserId();
             if (exercises.getVersionTag().equals("v2")) {
 
-                String notifyUrl = "homeworkId=" + exercises.getId() + "&type=" +exercises.getGroupType();
+                String notifyUrl = "homeworkId=" + exercises.getId() + "&homeworkType=" +exercises.getGroupType();
                 String extra = "dayaedu?type=homework&" + notifyUrl ;
                 sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_REMIND_IM_DETAIL_V2, exercises.getTeacherId().toString(), extra,
                         new String[]{studentId.toString()},

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

@@ -362,7 +362,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         List<StudentCourseHomework> list = studentCourseHomeworkDao.queryNotDoneHomeworkList();
         StringBuffer sb;
         for (StudentCourseHomework sch : list) {
-            sb = new StringBuffer("homeworkId=").append(sch.getCourseHomeworkId()).append("&type=HOMEWORK");
+            sb = new StringBuffer("homeworkId=").append(sch.getCourseScheduleId()).append("&homeworkType=HOMEWORK");
             Map<Integer, String> receivers = new HashMap<Integer, String>(1);
             receivers.put(sch.getUserId(), sch.getUserId() + "");
             sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_JOB_MESSAGE_V2, receivers, null, 0, "homework?" + sb, "STUDENT");
@@ -372,7 +372,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         List<ExtracurricularExercisesReply> extraList =  extracurricularExercisesReplyDao.queryNotDoneHomeworkList();
         for (ExtracurricularExercisesReply reply : extraList) {
             sb = new StringBuffer("homeworkId=").append(reply.getExtracurricularExercisesId())
-                    .append("&type=")
+                    .append("&homeworkType=")
                     .append(reply.getExtracurricularExercises().getGroupType());
             Map<Integer, String> receivers = new HashMap<Integer, String>(1);
             receivers.put(reply.getUserId(), reply.getUserId() + "");
@@ -1121,8 +1121,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         List<CourseHomeworkListDto> courseHomeworks = courseHomeworkDao.findEndHomework();
         StringBuffer sb;
         for (CourseHomeworkListDto courseHomework : courseHomeworks) {
-            sb = new StringBuffer("homeworkId=").append(courseHomework.getId())
-                    .append("&type=HOMEWORK");
+            sb = new StringBuffer("homeworkId=").append(courseHomework.getCourseScheduleId())
+                    .append("&homeworkType=HOMEWORK");
             Map<Integer, String> receivers = new HashMap<Integer, String>(1);
             String dateToString = DateUtil.dateToString(courseHomework.getCreateTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
             receivers.put(courseHomework.getTeacherId(), courseHomework.getTeacherId() + "");
@@ -1138,7 +1138,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         List<ExtracurricularExercises> extracurricularExercises = extracurricularExercisesDao.findEndHomework();
         for (ExtracurricularExercises exercises : extracurricularExercises) {
             sb = new StringBuffer("homeworkId=").append(exercises.getId())
-                    .append("&type=")
+                    .append("&homeworkType=")
                     .append(exercises.getGroupType());
             Map<Integer, String> receivers = new HashMap<Integer, String>(1);
             String dateToString = DateUtil.dateToString(exercises.getCreateTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);

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

@@ -39,6 +39,7 @@ import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -816,11 +817,17 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                 }
             }
             for (CourseHomeworkWrapper.CourseHomeworkList courseHomeworkList : courseHomeworkLists) {
-
+                courseHomeworkList.setAssignFlag(true);
                 // 如果是未布置的 设置时间
                 if(courseHomeworkList.getHomeWorkStatus().equals(EHomeWorkStatus.UNASSIGNED)){
                     courseHomeworkList.setAssignTime(queryInfo.getStartTime());
                     courseHomeworkList.setStudentIdList(groupIds.get(courseHomeworkList.getMusicGroupId()));
+                    // 如果结束时间小于当前时间  设置为已过期
+                    LocalDate now = LocalDate.now();
+                    LocalDate endTime = LocalDate.parse(DateUtil.dateToString(queryInfo.getEndTime()), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                    if(now.isAfter(endTime)){
+                        courseHomeworkList.setAssignFlag(false);
+                    }
                 }
 
                 // 乐团信息

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

@@ -837,7 +837,7 @@ public class StudentServeServiceImpl implements StudentServeService {
 
         // 作业按钮红点
         int num = studentCourseHomeworkDao.queryNotSuccessHomeworkList(userId);
-
+        num+= studentCourseHomeworkDao.queryNotSuccessExtraHomeworkList2(userId);
         HomeworkStat homeworkStat = new HomeworkStat();
         homeworkStat.setType("HOMEWORK");
         homeworkStatList.add(homeworkStat);

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

@@ -439,7 +439,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                             if (versionTag.equals("v2")) {
                                 Map<Integer, String> userMap = new HashMap<>();
                                 userMap.put(studentCourseHomework.getUserId(), studentCourseHomework.getUserId().toString());
-                                String notifyUrl = "homeworkId=" + courseHomework.getId() + "&type=" + ELessonTrainingType.HOMEWORK.getCode();
+                                String notifyUrl = "homeworkId=" + courseHomework.getCourseScheduleId() + "&homeworkType=" + ELessonTrainingType.HOMEWORK.getCode();
                                 String extra = "dayaedu?type=homework&" + notifyUrl ;
 
                                 sysMessageService.batchSendImMessage(MessageTypeEnum.IM_HOMEWORK_REMIND_V2, courseSchedule.getActualTeacherId().toString(), extra,

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

@@ -205,12 +205,15 @@
             cssp.be_merged_,
             st.current_grade_num_,
             st.current_class_,
+        s.id_ as subject_id_,
+        s.name_ as subject_name_,
             IF(sa.status_ IS NULL,'TRUANT',sa.status_) status_
         FROM
             course_schedule_student_payment cssp
             LEFT JOIN sys_user su ON cssp.user_id_ = su.id_
             LEFT JOIN student st ON st.user_id_ = su.id_
             LEFT JOIN student_attendance sa ON cssp.course_schedule_id_ = sa.course_schedule_id_ AND cssp.user_id_ = sa.user_id_
+        left join subject s on st.subject_id_list_ = s.id_
         WHERE
             cssp.course_schedule_id_ =#{courseScheduleId}
             AND su.id_ IS NOT NULL

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

@@ -30,6 +30,7 @@
 		<result column="versionTag" property="versionTag" />
 		<result column="type" property="type" />
 		<result column="push_flag_" property="pushFlag" />
+		<result column="group_type_" property="groupType" />
 	</resultMap>
 
 	<sql id="queryPageCondition">
@@ -66,7 +67,7 @@
                 and ee.group_type_ = #{type}
             </if>
             <if test="search != null ">
-                and (su.username_ like '%' #{search} '%' or mg.name_ like '%' #{search} '%')
+                and (su.real_name_ like '%' #{search} '%' or mg.name_ like '%' #{search} '%')
             </if>
             <if test="type != null">
                 and ee.group_type_ = #{type}
@@ -364,7 +365,7 @@
         <if test="versionTag != null">
             and version_tag_ = #{versionTag}
         </if>
-        <if test="musicGroupId != null">
+        <if test="musicGroupId!=null and musicGroupId!=''">
             and music_group_id_ = #{musicGroupId}
         </if>
 	</sql>

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

@@ -732,7 +732,8 @@
         WHERE
             sch.user_id_ = #{userId}
                 AND (sch.standard_flag_ not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null)
-        and ch.expiry_date_ >= #{now}
+        and ch.expiry_date_ >= now()
+        and ch.version_tag_ = 'v2'
     </select>
 
     <select id="getHomeworkByUserIdAndCourseHomeworkId" resultMap="StudentCourseHomework">
@@ -759,4 +760,17 @@
                 AND (sch.standard_flag_ not in ('STANDARD','EXCELLENT') or sch.standard_flag_ is null)
             and ch.version_tag_ = 'v2'
     </select>
+
+    <select id="queryNotSuccessExtraHomeworkList2" resultType="int">
+        SELECT
+            count(ee.id_)
+        FROM
+            extracurricular_exercises ee
+        left join extracurricular_exercises_reply eer on eer.extracurricular_exercises_id_ = ee.id_
+        WHERE
+        eer.user_id_ = #{userId}
+                AND (eer.standard_flag_ not in ('STANDARD','EXCELLENT') or eer.standard_flag_ is null)
+            and ee.expire_date_ &gt;= now()
+            and ee.version_tag_ = 'v2'
+    </select>
 </mapper>