|
@@ -204,7 +204,7 @@
|
|
|
LEFT JOIN sys_user su ON sees.student_id_=su.id_
|
|
LEFT JOIN sys_user su ON sees.student_id_=su.id_
|
|
|
WHERE su.del_flag_=0
|
|
WHERE su.del_flag_=0
|
|
|
AND su.organ_id_ IS NOT NULL
|
|
AND su.organ_id_ IS NOT NULL
|
|
|
- AND MONTH(sees.monday_)=MONTH(CONCAT(#{month}, '-01'))
|
|
|
|
|
|
|
+ AND MONTH(sees.monday_)=MONTH(CONCAT(#{dayStr}, '-01'))
|
|
|
AND sees.monday_<=#{dayStr}
|
|
AND sees.monday_<=#{dayStr}
|
|
|
GROUP BY su.organ_id_
|
|
GROUP BY su.organ_id_
|
|
|
ORDER BY su.organ_id_
|
|
ORDER BY su.organ_id_
|
|
@@ -306,7 +306,7 @@
|
|
|
AND t.job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
AND t.job_nature_ = #{jobNature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="dayStr!=null and dayStr!=''">
|
|
<if test="dayStr!=null and dayStr!=''">
|
|
|
- AND DATE_FORMAT(#{dayStr}, '%Y-%m-%d') <= #{dayStr}
|
|
|
|
|
|
|
+ AND DATE_FORMAT(t.create_time_, '%Y-%m-%d') <= #{dayStr}
|
|
|
</if>
|
|
</if>
|
|
|
GROUP BY
|
|
GROUP BY
|
|
|
t.organ_id_
|
|
t.organ_id_
|
