|
@@ -222,11 +222,15 @@
|
|
|
<if test="companyId !=null">
|
|
<if test="companyId !=null">
|
|
|
and (d.dept_id= #{companyId} or find_in_set(#{companyId},d.ancestors))
|
|
and (d.dept_id= #{companyId} or find_in_set(#{companyId},d.ancestors))
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="adminName != null"> and a.name like concat ('%',#{adminName},'%')</if>
|
|
|
<if test="projectStatus != null"> and a.project_status =#{projectStatus}</if>
|
|
<if test="projectStatus != null"> and a.project_status =#{projectStatus}</if>
|
|
|
<if test="projectNumber != null"> and b.project_number like concat ('%',#{projectNumber},'%')</if>
|
|
<if test="projectNumber != null"> and b.project_number like concat ('%',#{projectNumber},'%')</if>
|
|
|
<if test="projectName != null"> and b.name like concat ('%',#{projectName},'%')</if>
|
|
<if test="projectName != null"> and b.name like concat ('%',#{projectName},'%')</if>
|
|
|
|
|
+ <if test="researchStart != null and researchEnd != null">
|
|
|
|
|
+ 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">
|
|
<if test="startTime != null and endTime != null">
|
|
|
- and a.record_time between #{startTime} and #{endTime}
|
|
|
|
|
|
|
+ and b.start_time between #{startTime} and #{startTime}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="fullJob != null">and c.full_job= #{fullJob}</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>
|
|
<if test="deptId != null">and (d.dept_id= #{deptId} or find_in_set(#{deptId},d.ancestors)) </if>
|