|
@@ -423,6 +423,7 @@
|
|
|
cs.status_ AS `status`,
|
|
|
cs.start_time_ AS startTime,
|
|
|
cs.end_time_ AS endTime,
|
|
|
+ cs.class_date_ AS classDate,
|
|
|
(CASE WHEN cs.start_time_ >= ta.sign_in_time_ THEN 1 ELSE 0 END) AS teacherInSign,
|
|
|
(CASE WHEN cs.end_time_ <= ta.sign_out_time_ THEN 1 ELSE 0 END) AS teacherOutSign,
|
|
|
(CASE WHEN cs.start_time_ >= sa.sign_in_time_ THEN 1 ELSE 0 END) AS studentInSign,
|
|
@@ -467,7 +468,7 @@
|
|
|
AND salaryStatus = #{param.salaryStatus}
|
|
|
</if>
|
|
|
<if test="param.startTime != null">
|
|
|
- AND cs.class_date_ BETWEEN #{param.startTime} AND #{param.endTime}
|
|
|
+ AND classDate BETWEEN #{param.startTime} AND #{param.endTime}
|
|
|
</if>
|
|
|
<if test="param.studentId != null">
|
|
|
AND studentId = #{param.studentId}
|