|
|
@ -397,7 +397,7 @@ |
|
|
|
FROM hr_project_management hpm |
|
|
|
FROM hr_project_management hpm |
|
|
|
WHERE systemId = #{systemId} |
|
|
|
WHERE systemId = #{systemId} |
|
|
|
AND hpm.isdel = 0 |
|
|
|
AND hpm.isdel = 0 |
|
|
|
<if test="projectPermissions!=null and projectPermissions!=''">AND hpm.projectPer missions = |
|
|
|
<if test="projectPermissions!=null and projectPermissions!=''">AND hpm.projectPermissions = |
|
|
|
#{projectPermissions} |
|
|
|
#{projectPermissions} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
<if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%') |
|
|
|
<if test="searchContant!=null and searchContant!=''">and hpm.projectName like concat('%',#{searchContant},'%') |
|
|
@ -538,7 +538,7 @@ |
|
|
|
report.reportId, |
|
|
|
report.reportId, |
|
|
|
r.submitTime, |
|
|
|
r.submitTime, |
|
|
|
stu.studentId, |
|
|
|
stu.studentId, |
|
|
|
t.id as projectId |
|
|
|
t.id as projectId |
|
|
|
FROM tms_experimental_teaching t |
|
|
|
FROM tms_experimental_teaching t |
|
|
|
INNER JOIN tms_experimental_report report ON report.projectId = t.id |
|
|
|
INNER JOIN tms_experimental_report report ON report.projectId = t.id |
|
|
|
INNER JOIN tms_project_record r ON r.recordId = report.eventId |
|
|
|
INNER JOIN tms_project_record r ON r.recordId = report.eventId |
|
|
|