|
|
@ -442,9 +442,11 @@ |
|
|
|
hpm.isdel |
|
|
|
hpm.isdel |
|
|
|
FROM |
|
|
|
FROM |
|
|
|
hr_project_management hpm |
|
|
|
hr_project_management hpm |
|
|
|
|
|
|
|
LEFT JOIN |
|
|
|
|
|
|
|
tms_project_hidden tph on hpm.projectId = tph.project_id |
|
|
|
WHERE systemId = #{systemId} |
|
|
|
WHERE systemId = #{systemId} |
|
|
|
AND hpm.projectPermissions = #{projectPermissions} |
|
|
|
AND hpm.projectPermissions = #{projectPermissions} |
|
|
|
|
|
|
|
AND tph.is_hidden is NULL |
|
|
|
<if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%') |
|
|
|
<if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%') |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between |
|
|
|
<if test="startTime!=null and startTime!='' and endTime!=null and endTime != ''">and hpm.creationTime between |
|
|
@ -500,8 +502,11 @@ |
|
|
|
FROM |
|
|
|
FROM |
|
|
|
tms_experimental_teaching et inner join |
|
|
|
tms_experimental_teaching et inner join |
|
|
|
hr_project_management pm on et.project_id = pm.projectId |
|
|
|
hr_project_management pm on et.project_id = pm.projectId |
|
|
|
|
|
|
|
LEFT JOIN |
|
|
|
|
|
|
|
tms_project_hidden tph on et.id = tph.teach_id |
|
|
|
WHERE |
|
|
|
WHERE |
|
|
|
user_id = #{userId} |
|
|
|
user_id = #{userId} |
|
|
|
|
|
|
|
AND tph.is_hidden is NULL |
|
|
|
/*AND pm.isdel = 0*/ |
|
|
|
/*AND pm.isdel = 0*/ |
|
|
|
<if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like |
|
|
|
<if test="searchContant!=null and searchContant!=''">and et.experimental_class_name like |
|
|
|
concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or |
|
|
|
concat('%',#{searchContant},'%') or et.experimental_name like concat('%',#{searchContant},'%') or |
|
|
|