Commit baab8e10 authored by nie'hong's avatar nie'hong

完善工时统计

parent a69fbf33
......@@ -214,7 +214,7 @@
AND modify_time>=#{startModifyTime}
</if>
<if test="">
AND work_day>={startWorkTime}
AND work_day>=#{startWorkTime}
</if>
<if test="projectIdList != null">
AND project_id IN
......@@ -345,19 +345,19 @@
where
(t.work_day &lt;= #{endDate} or t.work_day is null) AND (t.status IN (2, 5) or t.status is null)
<if test="startDate != null">
AND (t.work_day > #{startDate} or t.work_day is null)
AND (t.work_day > #{startDate} or t.work_day is null)
</if>
AND ty.id in
<foreach collection="queryType" item="type" open="(" close=")" separator=",">
#{type}
</foreach>
AND (<if test="userIds.size != 0"> t.user_id in
<if test="userIds.size != 0">
AND ( t.user_id in
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
#{userId}
</foreach>
OR
</if>
t.user_id is null)
OR t.user_id is null)
</if>
GROUP BY <if test="isAll">u.id,u.`name`,</if> ty.id,ty.name, t.is_overtime
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment