作业提交

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

@@ -75,15 +75,22 @@ public class StudentVisit extends BaseEntity {
         }
     }
     public enum FeedbackTypeDescEnum implements BaseEnum<String,FeedbackTypeDescEnum> {
-        PRICE("价格原因"), TIME("时间原因"),
-        TEACHING("教学不满意"), OTHER("其他");
+        PRICE("PRICE","价格原因"), TIME("TIME","时间原因"),
+        TEACHING("TEACHING","教学不满意"), OTHER("OTHER","其他");
+
+        private String code;
 
         private String msg;
 
-        FeedbackTypeDescEnum(String msg) {
+        FeedbackTypeDescEnum(String code, String msg) {
+            this.code = code;
             this.msg = msg;
         }
 
+        public void setCode(String code) {
+            this.code = code;
+        }
+
         public String getMsg() {
             return msg;
         }
@@ -94,7 +101,7 @@ public class StudentVisit extends BaseEntity {
 
         @Override
         public String getCode() {
-            return this.msg;
+            return this.code;
         }
     }
 

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

@@ -305,8 +305,10 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 				}
 			}
 			dataList.removeAll(Collections.singleton(null));
+			int startRow = queryInfo.getPage() * queryInfo.getRows() - queryInfo.getRows();
 			dataList = dataList.stream().sorted(Comparator.comparing(TeacherHomeworkListDto::getDay).reversed()).
-					sorted(Comparator.comparing(TeacherHomeworkListDto::getStatus)).
+					sorted(Comparator.comparing(TeacherHomeworkListDto::getStatus))
+					.skip(startRow).limit(queryInfo.getRows()).
 					collect(Collectors.toList());
 			pageInfo.setRows(dataList);
 		}

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

@@ -289,8 +289,6 @@
 				AND DATE_FORMAT(ch.create_time_,'%Y-%m')=DATE_FORMAT(#{createTime}, '%Y-%m')
 			</if>
 		</where>) h
-		ORDER BY h.create_time_ DESC
-		<include refid="global.limit"/>
 	</select>
 	<select id="findByIdList" resultMap="com.ym.mec.biz.dal.dao.CourseHomeworkDao.teacherHomeworkListDto">
 		SELECT id_ homework_id_,title_,content_,completed_num_,expect_num_,music_score_id_,