|  | @@ -509,6 +509,9 @@
 | 
											
												
													
														|  |  			<if test="monday!=null and monday!='' and sunday!=null and sunday!=''">
 |  |  			<if test="monday!=null and monday!='' and sunday!=null and sunday!=''">
 | 
											
												
													
														|  |  				AND sees.monday_ BETWEEN #{monday} AND #{sunday}
 |  |  				AND sees.monday_ BETWEEN #{monday} AND #{sunday}
 | 
											
												
													
														|  |  			</if>
 |  |  			</if>
 | 
											
												
													
														|  | 
 |  | +			<if test="unDone!=null and unDone==1">
 | 
											
												
													
														|  | 
 |  | +				AND tm.teacher_id_ IS NULL
 | 
											
												
													
														|  | 
 |  | +			</if>
 | 
											
												
													
														|  |  			<if test="teacherId!=null">
 |  |  			<if test="teacherId!=null">
 | 
											
												
													
														|  |  				AND sees.teacher_id_ = #{teacherId}
 |  |  				AND sees.teacher_id_ = #{teacherId}
 | 
											
												
													
														|  |  			</if>
 |  |  			</if>
 | 
											
										
											
												
													
														|  | @@ -541,6 +544,9 @@
 | 
											
												
													
														|  |  		FROM
 |  |  		FROM
 | 
											
												
													
														|  |  			student_extracurricular_exercises_situation_ sees
 |  |  			student_extracurricular_exercises_situation_ sees
 | 
											
												
													
														|  |  			LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
 |  |  			LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
 | 
											
												
													
														|  | 
 |  | +			<if test="unDone!=null and unDone==1">
 | 
											
												
													
														|  | 
 |  | +				LEFT JOIN teacher_remind tm ON sees.monday_=tm.monday_ AND sees.teacher_id_=tm.teacher_id_
 | 
											
												
													
														|  | 
 |  | +			</if>
 | 
											
												
													
														|  |  			LEFT JOIN organization organ ON organ.id_=tea.organ_id_
 |  |  			LEFT JOIN organization organ ON organ.id_=tea.organ_id_
 | 
											
												
													
														|  |  			LEFT JOIN sys_user su ON tea.id_=su.id_
 |  |  			LEFT JOIN sys_user su ON tea.id_=su.id_
 | 
											
												
													
														|  |  		<include refid="queryTeacherServeInfoCondition" />
 |  |  		<include refid="queryTeacherServeInfoCondition" />
 | 
											
										
											
												
													
														|  | @@ -565,6 +571,9 @@
 | 
											
												
													
														|  |  			FROM
 |  |  			FROM
 | 
											
												
													
														|  |  				student_extracurricular_exercises_situation_ sees
 |  |  				student_extracurricular_exercises_situation_ sees
 | 
											
												
													
														|  |  				LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
 |  |  				LEFT JOIN teacher tea ON tea.id_=sees.teacher_id_
 | 
											
												
													
														|  | 
 |  | +				<if test="unDone!=null and unDone==1">
 | 
											
												
													
														|  | 
 |  | +					LEFT JOIN teacher_remind tm ON sees.monday_=tm.monday_ AND sees.teacher_id_=tm.teacher_id_
 | 
											
												
													
														|  | 
 |  | +				</if>
 | 
											
												
													
														|  |  			<include refid="queryTeacherServeInfoCondition" />
 |  |  			<include refid="queryTeacherServeInfoCondition" />
 | 
											
												
													
														|  |  			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
 |  |  			GROUP BY sees.monday_,sees.sunday_,sees.teacher_id_
 | 
											
												
													
														|  |  			<if test="unDone!=null">
 |  |  			<if test="unDone!=null">
 |