Browse Source

feat:服务指标预警,服务指标明细剔除未开始的课程

Joburgess 4 years ago
parent
commit
d2cba7c656

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

@@ -539,7 +539,7 @@
 			LEFT JOIN organization organ ON organ.id_=tea.organ_id_
 			LEFT JOIN sys_user su ON tea.id_=su.id_
 		<include refid="queryTeacherServeInfoCondition" />
-		GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_ ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
+		GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
 		<if test="unDone!=null">
 			HAVING
 			<if test="unDone==1">
@@ -549,6 +549,7 @@
 				SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
 			</if>
 		</if>
+		ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
 		<include refid="global.limit"></include>
 	</select>
 
@@ -560,7 +561,7 @@
 				student_extracurricular_exercises_situation_ sees
 				LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
 			<include refid="queryTeacherServeInfoCondition" />
-			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_ ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
+			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
 			<if test="unDone!=null">
 				HAVING
 				<if test="unDone==1">
@@ -570,6 +571,7 @@
 					SUM( sees.expect_exercises_num_-sees.not_over_course_num_ ) &lt;= SUM( sees.actual_exercises_num_ )
 				</if>
 			</if>
+			ORDER BY sees.monday_,sees.sunday_,sees.teacher_id_
 		) e
 	</select>