|
|
@@ -230,7 +230,7 @@
|
|
|
and( #{researchStart} between b.start_time and b.end_time or #{researchEnd} between b.start_time and b.end_time)
|
|
|
</if>
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
- and b.start_time between #{startTime} and #{startTime}
|
|
|
+ and a.record_time between #{startTime} and #{endTime}
|
|
|
</if>
|
|
|
<if test="fullJob != null">and c.full_job= #{fullJob}</if>
|
|
|
<if test="deptId != null">and (d.dept_id= #{deptId} or find_in_set(#{deptId},d.ancestors)) </if>
|