|
|
@@ -192,7 +192,7 @@
|
|
|
</update>
|
|
|
<select id="selectList" resultType="com.ruoyi.project.bo.ProjectStaffRecordOut">
|
|
|
select a.id,c.job_number jobNumber,a.name ,d.dept_id deptId ,d.dept_name deptName ,c.create_time createMonth,
|
|
|
- b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,
|
|
|
+ b.name projectName,b.admin_name adminName ,a.project_status projectStatus,a.content ,b.project_number projectNumber,
|
|
|
a.pid ,a.aid ,a.examine_id examineId ,a.examine_name examineName ,a.examine_time examineTime,
|
|
|
a.annex_url annexUrl,a.create_time createTime,a.process_status processStatus , a.duration
|
|
|
from project_staff_record a left join project_task b on a.pid=b.id
|
|
|
@@ -213,7 +213,18 @@
|
|
|
<if test="companyId !=null">
|
|
|
and (d.dept_id= #{companyId} or find_in_set(#{companyId},d.ancestors))
|
|
|
</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="projectName != null"> and b.name like concat ('%',#{projectName},'%')</if>
|
|
|
+ <if test="startTime != null and endTime != null">
|
|
|
+ and a.record_time between #{startTime} and #{endTime}
|
|
|
+ </if>
|
|
|
+ <if test="fullJob != null">and c.full_job= #{fullJob}</if>
|
|
|
+ <if test="deptId != null">and c.dept_id= #{deptId}</if>
|
|
|
</select>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<select id="selectById" resultType="java.lang.Integer">
|
|
|
select count(*)
|
|
|
from project_staff_record a left join project_staff ps on a.aid = ps.aid
|