Browse Source

1、老师端已布置训练列表,将未点评作业默认排前面,最近点评作业排在已点评前面
2、消息列表将未读排前面

zouxuan 3 years ago
parent
commit
77b5d0ab42

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

@@ -267,6 +267,9 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 						}else if(noRepliedNum<=0&&notSubmitNum<=0){
 							homeworkListDto.setStatus(3);
 						}
+						if(homeworkListDto.getIsSubmit() == 0){
+							homeworkListDto.setIsReplied(0);
+						}
 					}
 					dataList.addAll(byIdList);
 				}
@@ -300,12 +303,16 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 						}else if(noRepliedNum<=0&&notSubmitNum<=0){
 							teacherHomeworkListDto.setStatus(3);
 						}
+						if(teacherHomeworkListDto.getIsSubmit() == 0){
+							teacherHomeworkListDto.setIsReplied(0);
+						}
 					}
 					dataList.addAll(byIdList);
 				}
 			}
 			dataList.removeAll(Collections.singleton(null));
-			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).collect(Collectors.toList());
+			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).
+					sorted(Comparator.comparing(TeacherHomeworkListDto::getIsReplied)).collect(Collectors.toList());
 			pageInfo.setRows(dataList);
 		}
 		return pageInfo;

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -172,14 +172,14 @@
 	<select id="queryPage" parameterType="map" resultMap="message">
 		select m.* from sys_message m
 		<include refid="queryCondition" />
-		order by m.create_on_ desc
+		order by m.read_status_,m.create_on_ desc
 		<include refid="global.limit" />
 	</select>
 
 	<select id="queryListPage" parameterType="map" resultMap="messageDto">
 		select m.*,u.username_ from sys_message m left join sys_user u on m.user_id_ = u.id_
 		<include refid="queryCondition" />
-		order by m.create_on_ desc
+		order by m.read_status_,m.create_on_ desc
 		<include refid="global.limit" />
 	</select>